diff --git a/CommonInstaller b/CommonInstaller
index 54b1cb6..11a2b14 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -220,6 +220,22 @@ is_mounted () {
 # mount partitions
 ##########################################################################################
 
+find_block () {
+	unset tmp
+	tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${1}${SLOT} | head -n 1)
+	[ -z ${tmp} ] && tmp=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${1}${SLOT} | head -n 1)
+	if [ -z ${tmp} ]; then
+		for uevent in /sys/dev/block/*/uevent; do
+			partname=$(awk -F= '/PARTNAME/{print $2}' ${uevent})
+			if [ "${1}${SLOT}" = "${partname}" ]; then
+				tmp="/dev/block/$(awk -F= '/DEVNAME/{print $2}' ${uevent})"
+				break
+			fi
+		done
+	fi
+	readlink -f ${tmp}
+}
+
 mount_partitions () {
 	if ! ${BOOTMODE}; then
 		DEVICE_AB=FALSE
@@ -242,34 +258,26 @@ mount_partitions () {
 
 		mount -o bind /dev/urandom /dev/random
 
-		system_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name system${SLOT} | head -n 1)
-		echo " INFO: #4 [system_tmp] ${system_tmp}"
-		SYSTEM_BLOCK=$(readlink -f ${system_tmp})
+		SYSTEM_BLOCK=$(find_block system)
 		echo " INFO: #5 [SYSTEM_BLOCK] ${SYSTEM_BLOCK}"
 
-		SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
-		if [ -L /system_root ]; then
-			mv /system_root /system_root_link
-			mkdir -p /system_root
+		mkdir -p /system /system_root
+		mount -o rw ${SYSTEM_BLOCK} /system
+
+		if [ -f /system/build.prop ]; then
+			SYSTEM=/system
+		elif [ -f /system/system/build.prop -o -f /system/init -o -L /system/init ]; then
+			SYSTEM_AS_ROOT=true
+			SYSTEM=/system/system
+			if ! mount --move /system /system_root; then
+				umount /system
+				umount -l /system
+				moun -o rw ${SYSTEM_BLOCK} /system_root
+			fi
+			mount -o bind /system_root/system /system
 		fi
 
-		if [ -d /system_root ]; then
-			mount -o rw /system_root || mount -orw ${SYSTEM_BLOCK} /system_root
-			if [ -d /system_root/system ]; then
-				mkdir -p /system
-				mount -o bind /system_root/system /system
-			fi
-		elif [ -d /system ]; then
-			mount -o rw /system || mount -o rw ${SYSTEM_BLOCK} /system
-			if [ -d /system/system ]; then
-				mkdir -p /system
-				mount -o bind /system/system
-			fi
-		fi
-
-		vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
-		echo " INFO: #6 [vendor_tmp] ${vendor_tmp}"
-		VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
+		VENDOR_BLOCK=$(find_block vendor)
 		echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
 
 		! is_mounted /vendor && mount -o ro /vendor
diff --git a/patcher/CommonPatcher b/patcher/CommonPatcher
index e6c92c1..cac8a8b 100644
--- a/patcher/CommonPatcher
+++ b/patcher/CommonPatcher
@@ -96,6 +96,22 @@ mount_apex () {
 }
 
 # taken from Magisk, with minor modifications for NanoDroid
+find_block () {
+	unset tmp
+	tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${1}${SLOT} | head -n 1)
+	[ -z ${tmp} ] && tmp=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${1}${SLOT} | head -n 1)
+	if [ -z ${tmp} ]; then
+		for uevent in /sys/dev/block/*/uevent; do
+			partname=$(awk -F= '/PARTNAME/{print $2}' ${uevent})
+			if [ "${1}${SLOT}" = "${partname}" ]; then
+				tmp="/dev/block/$(awk -F= '/DEVNAME/{print $2}' ${uevent})"
+				break
+			fi
+		done
+	fi
+	readlink -f ${tmp}
+}
+
 mount_partitions () {
 	if ! ${BOOTMODE}; then
 		DEVICE_AB=FALSE
@@ -118,34 +134,26 @@ mount_partitions () {
 
 		mount -o bind /dev/urandom /dev/random
 
-		system_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name system${SLOT} | head -n 1)
-		echo " INFO: #4 [system_tmp] ${system_tmp}"
-		SYSTEM_BLOCK=$(readlink -f ${system_tmp})
+		SYSTEM_BLOCK=$(find_block system)
 		echo " INFO: #5 [SYSTEM_BLOCK] ${SYSTEM_BLOCK}"
 
-		SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
-		if [ -L /system_root ]; then
-			mv /system_root /system_root_link
-			mkdir -p /system_root
+		mkdir -p /system /system_root
+		mount -o rw ${SYSTEM_BLOCK} /system
+
+		if [ -f /system/build.prop ]; then
+			SYSTEM=/system
+		elif [ -f /system/system/build.prop -o -f /system/init -o -L /system/init ]; then
+			SYSTEM_AS_ROOT=true
+			SYSTEM=/system/system
+			if ! mount --move /system /system_root; then
+				umount /system
+				umount -l /system
+				moun -o rw ${SYSTEM_BLOCK} /system_root
+			fi
+			mount -o bind /system_root/system /system
 		fi
 
-		if [ -d /system_root ]; then
-			mount -o rw /system_root || mount -orw ${SYSTEM_BLOCK} /system_root
-			if [ -d /system_root/system ]; then
-				mkdir -p /system
-				mount -o bind /system_root/system /system
-			fi
-		elif [ -d /system ]; then
-			mount -o rw /system || mount -o rw ${SYSTEM_BLOCK} /system
-			if [ -d /system/system ]; then
-				mkdir -p /system
-				mount -o bind /system/system
-			fi
-		fi
-
-		vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
-		echo " INFO: #6 [vendor_tmp] ${vendor_tmp}"
-		VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
+		VENDOR_BLOCK=$(find_block vendor)
 		echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
 
 		! is_mounted /vendor && mount -o ro /vendor
diff --git a/systest/SysTest b/systest/SysTest
index bb1cfff..bbd1ba0 100644
--- a/systest/SysTest
+++ b/systest/SysTest
@@ -85,7 +85,24 @@ mount_apex () {
 	done
 }
 
-# taken from Magisk, with minor modifications for NanoDroid
+# taken from Magisk, with modifications for NanoDroid
+
+find_block () {
+	unset tmp
+	tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${1}${SLOT} | head -n 1)
+	[ -z ${tmp} ] && tmp=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${1}${SLOT} | head -n 1)
+	if [ -z ${tmp} ]; then
+		for uevent in /sys/dev/block/*/uevent; do
+			partname=$(awk -F= '/PARTNAME/{print $2}' ${uevent})
+			if [ "${1}${SLOT}" = "${partname}" ]; then
+				tmp="/dev/block/$(awk -F= '/DEVNAME/{print $2}' ${uevent})"
+				break
+			fi
+		done
+	fi
+	readlink -f ${tmp}
+}
+
 mount_partitions () {
 	DEVICE_AB=FALSE
 	VENDOR_COMPAT=FALSE
@@ -100,11 +117,8 @@ mount_partitions () {
 		fi
 	fi
 
-	system_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name system${SLOT} | head -n 1)
-	SYSTEM_BLOCK=$(readlink -f ${system_tmp})
-
-	vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
-	VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
+	SYSTEM_BLOCK=$(find_block system)
+	VENDOR_BLOCK=$(find_block vendor)
 
 	if ${BOOTMODE}; then
 		build_props=$(find /system /system_root /vendor -type f -name build.prop)
@@ -119,24 +133,20 @@ mount_partitions () {
 
 		mount -o bind /dev/urandom /dev/random
 
-		SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
-		if [ -L /system_root ]; then
-			mv /system_root /system_root_link
-			mkdir -p /system_root
-		fi
+		mkdir -p /system /system_root
+		mount -o rw ${SYSTEM_BLOCK} /system
 
-		if [ -d /system_root ]; then
-			mount -o rw /system_root || mount -orw ${SYSTEM_BLOCK} /system_root
-			if [ -d /system_root/system ]; then
-				mkdir -p /system
-				mount -o bind /system_root/system /system
-			fi
-		elif [ -d /system ]; then
-			mount -o rw /system || mount -o rw ${SYSTEM_BLOCK} /system
-			if [ -d /system/system ]; then
-				mkdir -p /system
-				mount -o bind /system/system
+		if [ -f /system/build.prop ]; then
+			SYSTEM=/system
+		elif [ -f /system/system/build.prop -o -f /system/init -o -L /system/init ]; then
+			SYSTEM_AS_ROOT=true
+			SYSTEM=/system/system
+			if ! mount --move /system /system_root; then
+				umount /system
+				umount -l /system
+				moun -o rw ${SYSTEM_BLOCK} /system_root
 			fi
+			mount -o bind /system_root/system /system
 		fi
 
 		! is_mounted /vendor && mount -o ro /vendor
@@ -379,8 +389,8 @@ store_results () {
 	add_log "DEVICE_AB=${DEVICE_AB}"
 	add_log "VENDOR_COMPAT=${VENDOR_COMPAT}"
 	add_log "SYSTEM_AS_ROOT=${SYSTEM_AS_ROOT}"
-	add_log "SYSTEMBLOCK=${SYSTEM_BLOCK}"
-	add_log "VENDORBLOCK=${VENDOR_BLOCK}"
+	add_log "SYSTEM_BLOCK=${SYSTEM_BLOCK}"
+	add_log "VENDOR_BLOCK=${VENDOR_BLOCK}"
 	add_log "SLOT=${SLOT}"
 	add_log ""
 	mount | sed '/magisk/d' | awk '{print $1 " on " $3 " params: " $6}' >> ${LOGFILE}
diff --git a/uninstaller/META-INF/com/google/android/update-binary b/uninstaller/META-INF/com/google/android/update-binary
index b253cb4..7d5bf65 100644
--- a/uninstaller/META-INF/com/google/android/update-binary
+++ b/uninstaller/META-INF/com/google/android/update-binary
@@ -112,6 +112,22 @@ error () {
 # mount partitions
 ##########################################################################################
 
+find_block () {
+	unset tmp
+	tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${1}${SLOT} | head -n 1)
+	[ -z ${tmp} ] && tmp=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${1}${SLOT} | head -n 1)
+	if [ -z ${tmp} ]; then
+		for uevent in /sys/dev/block/*/uevent; do
+			partname=$(awk -F= '/PARTNAME/{print $2}' ${uevent})
+			if [ "${1}${SLOT}" = "${partname}" ]; then
+				tmp="/dev/block/$(awk -F= '/DEVNAME/{print $2}' ${uevent})"
+				break
+			fi
+		done
+	fi
+	readlink -f ${tmp}
+}
+
 mount_partitions () {
 	if ! ${BOOTMODE}; then
 		DEVICE_AB=FALSE
@@ -134,29 +150,26 @@ mount_partitions () {
 
 		mount -o bind /dev/urandom /dev/random
 
-		SYSTEM_AS_ROOT=$(grep_prop ro.build.ab_update /default.prop)
-		if [ -L /system_root ]; then
-			mv /system_root /system_root_link
-			mkdir -p /system_root
+		SYSTEM_BLOCK=$(find_block system)
+		echo " INFO: #5 [SYSTEM_BLOCK] ${SYSTEM_BLOCK}"
+
+		mkdir -p /system /system_root
+		mount -o rw ${SYSTEM_BLOCK} /system
+
+		if [ -f /system/build.prop ]; then
+			SYSTEM=/system
+		elif [ -f /system/system/build.prop -o -f /system/init -o -L /system/init ]; then
+			SYSTEM_AS_ROOT=true
+			SYSTEM=/system/system
+			if ! mount --move /system /system_root; then
+				umount /system
+				umount -l /system
+				moun -o rw ${SYSTEM_BLOCK} /system_root
+			fi
+			mount -o bind /system_root/system /system
 		fi
 
-		if [ -d /system_root ]; then
-			mount -o rw /system_root || mount -orw ${SYSTEM_BLOCK} /system_root
-			if [ -d /system_root/system ]; then
-				mkdir -p /system
-				mount -o bind /system_root/system /system
-			fi
-		elif [ -d /system ]; then
-			mount -o rw /system || mount -o rw ${SYSTEM_BLOCK} /system
-			if [ -d /system/system ]; then
-				mkdir -p /system
-				mount -o bind /system/system
-			fi
-		fi
-
-		vendor_tmp=$(find /dev/block \( -type b -o -type c -o -type l \) -name vendor${SLOT} | head -n 1)
-		echo " INFO: #6 [vendor_tmp] ${vendor_tmp}"
-		VENDOR_BLOCK=$(readlink -f ${vendor_tmp})
+		VENDOR_BLOCK=$(find_block vendor)
 		echo " INFO: #7 [VENDOR_BLOCK] ${VENDOR_BLOCK}"
 
 		! is_mounted /vendor && mount -o ro /vendor