diff --git a/configs/check_features.sh b/configs/check_features.sh
index dd2188f..762167e 100644
--- a/configs/check_features.sh
+++ b/configs/check_features.sh
@@ -4,11 +4,11 @@ sku=`getprop ro.boot.hardware.sku`
 
 if [ "$sku" = "XT1687" ]; then
     # XT1687 doesn't have NFC chip
-    rm /system/vendor/etc/permissions/android.hardware.nfc.xml
-    rm /system/vendor/etc/permissions/android.hardware.nfc.hce.xml
-    rm /system/vendor/etc/permissions/com.android.nfc_extras.xml
+    rm /vendor/etc/permissions/android.hardware.nfc.xml
+    rm /vendor/etc/permissions/android.hardware.nfc.hce.xml
+    rm /vendor/etc/permissions/com.android.nfc_extras.xml
     rm -r /system/app/NfcNci
 else
     # Only XT1687 variant got a compass
-    rm /system/vendor/etc/permissions/android.hardware.sensor.compass.xml
+    rm /vendor/etc/permissions/android.hardware.sensor.compass.xml
 fi
diff --git a/releasetools/releasetools.py b/releasetools/releasetools.py
index cce8acd..da9b703 100644
--- a/releasetools/releasetools.py
+++ b/releasetools/releasetools.py
@@ -21,8 +21,8 @@ def FullOTA_InstallEnd(info):
   ReplaceDeviceConfig(info)
 
 def ReplaceDeviceConfig(info):
-  info.script.Mount("/system")
+  info.script.Mount("/vendor")
   info.script.AppendExtra('ui_print("Checking NFC and compass support");')
-  info.script.AppendExtra('run_program("/sbin/sh", "/system/vendor/bin/check_features.sh");')
-  info.script.Unmount("/system")
+  info.script.AppendExtra('run_program("/sbin/sh", "/vendor/bin/check_features.sh");')
+  info.script.Unmount("/vendor")