diff --git a/src/detection/cpuUsage/cpuUsage_linux.c b/src/detection/cpuUsage/cpuUsage_linux.c
index 8667fd526..1888b2b13 100644
--- a/src/detection/cpuUsage/cpuUsage_linux.c
+++ b/src/detection/cpuUsage/cpuUsage_linux.c
@@ -10,7 +10,13 @@ const char* ffGetCpuUsageInfo(uint64_t* inUseAll, uint64_t* totalAll)
 
     FILE* procStat = fopen("/proc/stat", "r");
     if(procStat == NULL)
+    {
+        #ifdef __ANDROID__
+        return "Accessing \"/proc/stat\" is restricted on Android O+";
+        #else
         return "fopen(\"""/proc/stat\", \"r\") == NULL";
+        #endif
+    }
 
     if (fscanf(procStat, "cpu%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64, &user, &nice, &system, &idle, &iowait, &irq, &softirq) < 0)
     {
diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c
index 2ff4395a9..93dee0f7d 100644
--- a/src/detection/disk/disk_linux.c
+++ b/src/detection/disk/disk_linux.c
@@ -20,8 +20,9 @@ void ffDetectDisksImpl(FFDiskResult* disks)
         //Format of the file: "<device> <mountpoint> <filesystem> <options> ..." (Same as fstab)
         char* currentPos = line;
 
-        //Non pseudo filesystems have their device in /dev/, we only add those
-        if(strncasecmp(currentPos, "/dev/", 5) != 0)
+        //Non pseudo filesystems have their device in /dev/
+        //DrvFs is a filesystem plugin to WSL that was designed to support interop between WSL and the Windows filesystem.
+        if(strncmp(currentPos, "/dev/", 5) != 0 && strncmp(currentPos, "drvfs", 5) != 0)
             continue;
 
         //Skip /dev/
@@ -55,12 +56,21 @@ void ffDetectDisksImpl(FFDiskResult* disks)
         while(isspace(*currentPos))
             ++currentPos;
 
+        #ifdef __ANDROID__
+        if(ffStrbufEqualS(&disk->mountpoint, "/") || ffStrbufEqualS(&disk->mountpoint, "/storage/emulated"))
+            disk->type = FF_DISK_TYPE_REGULAR;
+        else if(ffStrbufStartsWithS(&disk->mountpoint, "/mnt/media_rw/"))
+            disk->type = FF_DISK_TYPE_EXTERNAL;
+        else
+            disk->type = FF_DISK_TYPE_HIDDEN;
+        #else
         if(strstr(currentPos, "nosuid") != NULL || strstr(currentPos, "nodev") != NULL)
             disk->type = FF_DISK_TYPE_EXTERNAL;
         else if(ffStrbufStartsWithS(&disk->mountpoint, "/boot") || ffStrbufStartsWithS(&disk->mountpoint, "/efi"))
             disk->type = FF_DISK_TYPE_HIDDEN;
         else
             disk->type = FF_DISK_TYPE_REGULAR;
+        #endif
 
         //Detects stats
         struct statvfs fs;