diff --git a/base.mk b/base.mk
index d1f002d..2f89f2c 100644
--- a/base.mk
+++ b/base.mk
@@ -28,8 +28,8 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 	
 #Huawei HiSuite (also other OEM custom programs I guess) it's of no use in AOSP builds
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-	persist.sys.usb.config=adb
-	
+	persist.sys.usb.config=adb \
+	ro.cust.cdrom=/dev/null	
 
 #VNDK config files
 PRODUCT_COPY_FILES += \
diff --git a/vndk-detect b/vndk-detect
index 21c3d8e..5e59de8 100644
--- a/vndk-detect
+++ b/vndk-detect
@@ -13,6 +13,8 @@ mount -o bind /system/bin/adbd /sbin/adbd
 if ( getprop ro.hardware | grep -qE '(kirin970|hi3660|hi6250|hi3670)' );then
 	FOUND_HUAWEI=1
 	setprop persist.sys.bt_acl_bypass true
+	setprop persist.sys.camera.huawei true
+	setprop persist.sys.radio.huawei true
 fi
 
 if getprop ro.vendor.build.fingerprint |grep -qiE '(huawei|honor|hi3660)' || [ -n "$FOUND_HUAWEI" ];then
@@ -29,10 +31,3 @@ if getprop ro.hardware |grep -qiE -e qcom -e judyln;then
 	setprop persist.sys.overlay.devinputjack true
 fi
 
-if ( getprop ro.hardware | grep -qE '(hi6250)' );then
-	setprop QC.HI6250 1
-fi
-
-if ( getprop ro.hardware | grep -qE '(hi3660|hi3670|kirin970)' );then
-	setprop QC.HI36x0 1
-fi