diff --git a/ChangeLog.md b/ChangeLog.md
index e7f7dc0..29d5e7a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,8 +2,17 @@
 
 ## 17.0 in-dev
 
+### Bug Fixes
+
+* CommonInstaller
+  * System Mode
+     * fix creating Uninstaller information for directories
+
 ### General Changes
 
+* CommonInstaller
+  * System Mode
+     * create /data/adb if it does not exist
 * Full package
   * switch to QKSMS 3
 * Uninstaller
diff --git a/CommonInstaller b/CommonInstaller
index 65c7520..d3b568c 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -390,6 +390,8 @@ detect_arch () {
 		echo " ++ ROM has no /system/xbin, using /system/bin instead"
 	else	ROM_NO_XBIN=0
 	fi
+
+	[ ! -d /data/adb ] && mkdir /data/adb
 }
 
 ##########################################################################################
@@ -652,7 +654,7 @@ install_gsync () {
 			set_perm_data -r "${MODPATH}/system/etc/"
 
 			[ "${MODE}" = "SYSTEM" ] && \
-				find -type f "${INSTALLER}/gsync/permissions/" |
+				find "${INSTALLER}/gsync/permissions/" -type f |
 					sed -e "s,${INSTALLER}/gsync,/system/etc,g" \
 					>> /data/adb/.nanodroid-list
 		fi
@@ -873,7 +875,7 @@ nanodroid_install_dir () {
 	esac
 
 	[ "${MODE}" = "SYSTEM" ] && \
-		find -type f "${INSTALLER}${dest}" | \
+		find "${INSTALLER}/system/${dir}" -type f | \
 			sed -e "s,^${INSTALLER},,g" \
 			>> /data/adb/.nanodroid-list
 }