diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cf851dd9..f6907312 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -375,9 +375,9 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
 
 BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
 
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))
 ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD
-$(error vendor_boot.modules.load not found or empty)
+$(error vendor_kernel_boot.modules.load not found or empty)
 endif
 BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD)))
 
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 7913246c..4ef0657c 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -407,6 +407,7 @@ on post-fs-data
     chmod 0771 /mnt/vendor/persist/camera
     chmod 0771 /mnt/vendor/persist/camera/OTP_calibration
     chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data
+    mkdir /mnt/vendor/persist/camera/rear 0770 system system
     chmod 0771 /mnt/vendor/persist/camera/rear
 
     # Audio dump and debug
diff --git a/device.mk b/device.mk
index 61dc81ae..d8cdfda2 100644
--- a/device.mk
+++ b/device.mk
@@ -141,24 +141,17 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.asha.central.enabled?=true \
 	bluetooth.profile.a2dp.source.enabled?=true \
 	bluetooth.profile.avrcp.target.enabled?=true \
-	bluetooth.profile.bap.broadcast.assist.enabled?=true \
-	bluetooth.profile.bap.unicast.client.enabled?=true \
 	bluetooth.profile.bas.client.enabled?=true \
-	bluetooth.profile.csip.set_coordinator.enabled?=true \
 	bluetooth.profile.gatt.enabled?=true \
-	bluetooth.profile.hap.client.enabled?=true \
 	bluetooth.profile.hfp.ag.enabled?=true \
 	bluetooth.profile.hid.device.enabled?=true \
 	bluetooth.profile.hid.host.enabled?=true \
 	bluetooth.profile.map.server.enabled?=true \
-	bluetooth.profile.mcp.server.enabled?=true \
 	bluetooth.profile.opp.enabled?=true \
 	bluetooth.profile.pan.nap.enabled?=true \
 	bluetooth.profile.pan.panu.enabled?=true \
 	bluetooth.profile.pbap.server.enabled?=true \
 	bluetooth.profile.sap.server.enabled?=true \
-	bluetooth.profile.ccp.server.enabled?=true \
-	bluetooth.profile.vcp.controller.enabled?=true
 
 # Carrier configuration default location
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -899,10 +892,10 @@ USE_EARLY_SEND_DEVICE_INFO := true
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
-endif
 
 #GPS HAL
 include device/google/gs201/gnss/device-gnss.mk
+endif
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
diff --git a/modem/userdebug.mk b/modem/userdebug.mk
index ba4c0e9d..2b0c3983 100644
--- a/modem/userdebug.mk
+++ b/modem/userdebug.mk
@@ -1 +1,3 @@
-PRODUCT_PACKAGES += vcd
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+  PRODUCT_PACKAGES += vcd
+endif