diff --git a/app b/app
index c461fc6da..fd6cbb138 160000
--- a/app
+++ b/app
@@ -1 +1 @@
-Subproject commit c461fc6daa7096398f9227a10bcb4cec271cb5e7
+Subproject commit fd6cbb138c839ca77d4b99137911bb59f2f36876
diff --git a/core/jni/magiskpolicy b/core/jni/magiskpolicy
index d7a612727..d4620e165 160000
--- a/core/jni/magiskpolicy
+++ b/core/jni/magiskpolicy
@@ -1 +1 @@
-Subproject commit d7a6127273407a32bccf75e70fa7bbe84c14e4f8
+Subproject commit d4620e1654bd23e832840d0704c4cb967b159639
diff --git a/core/jni/su b/core/jni/su
index a9d966dc7..8b15e4225 160000
--- a/core/jni/su
+++ b/core/jni/su
@@ -1 +1 @@
-Subproject commit a9d966dc7ab97006445315ef3c13f2d2e020fffc
+Subproject commit 8b15e42253091a28c33a5e5e827d7750576d54dd
diff --git a/scripts/magisk_uninstaller.sh b/scripts/magisk_uninstaller.sh
index a30b5f274..3b9dc7b83 100644
--- a/scripts/magisk_uninstaller.sh
+++ b/scripts/magisk_uninstaller.sh
@@ -51,18 +51,20 @@ migrate_boot_backup
 ui_print "- Unpacking boot image"
 ./magiskboot --unpack "$BOOTIMAGE"
 CHROMEOS=false
+
 case $? in
   1 )
     abort "! Unable to unpack boot image"
     ;;
-  2 )
+  3 )
+    ui_print "- ChromeOS boot image detected"
     CHROMEOS=true
     ;;
-  3 )
+  4 )
     ui_print "! Sony ELF32 format detected"
     abort "! Please use BootBridge from @AdrianDC to flash Magisk"
     ;;
-  4 )
+  5 )
     ui_print "! Sony ELF64 format detected"
     abort "! Stock kernel cannot be patched, please use a custom kernel"
 esac
@@ -102,6 +104,6 @@ cd /
 ui_print "- Removing Magisk files"
 rm -rf  /cache/*magisk* /cache/unblock /data/*magisk* /data/cache/*magisk* /data/property/*magisk* \
         /data/Magisk.apk /data/busybox /data/custom_ramdisk_patch.sh /data/app/com.topjohnwu.magisk* \
-        /data/user*/*/magisk.db /data/user*/*/com.topjohnwu.magisk 2>/dev/null
+        /data/user*/*/magisk.db /data/user*/*/com.topjohnwu.magisk /data/adb/*magisk* 2>/dev/null
 
 $BOOTMODE && reboot