diff --git a/init/init_sanders.cpp b/init/init_sanders.cpp
index da3200e..49cafc2 100644
--- a/init/init_sanders.cpp
+++ b/init/init_sanders.cpp
@@ -93,4 +93,15 @@ void vendor_load_properties()
     property_set("ro.hw.imager", "12MP");
 
     num_sims();
+     if (sku == "XT1806") {
+         property_set("ro.hw.ecompass", "true");
+         property_set("ro.hw.nfc", "false");
+     }
+     else {
+         property_set("ro.hw.ecompass", "false");
+         property_set("ro.hw.nfc", "true");
+     }
+     if (sku == "XT1802") {
+         property_set("ro.hw.dtv", "true");
+     }
 }
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 0ec996e..e091da4 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -767,6 +767,10 @@ service iprenew_wigig0 /system/bin/dhcpcd -n
 on property:ro.hw.dtv=true
     insmod /system/vendor/lib/modules/isdbt.ko
 
+on property:crypto.driver.load=1
+    insmod /system/lib/modules/qce.ko
+    insmod /system/lib/modules/qcedev.ko
+
 service wlan_logging /system/bin/cnss_diag -q -f
     class main
     user system