diff --git a/universal7885-common/configs/props/vendor.prop b/universal7885-common/configs/props/vendor.prop
index 79aac9e..789b1a5 100644
--- a/universal7885-common/configs/props/vendor.prop
+++ b/universal7885-common/configs/props/vendor.prop
@@ -50,7 +50,13 @@ vendor.display.disable_scaler=0
 
 ## SoC
 ro.soc.manufacturer=samsung
-ro.soc.model=exynos7884B
+ro.soc.model=exynos7885
+
+### CSC
+ro.csc.sales_code=KTC
+ro.csc.country_code=Korea
+ro.csc.countryiso_code=KR
+ro.csc.omcmw_code=KTC
 
 # Wifi direct
 wifi.direct.interface=p2p0
diff --git a/universal7885-common/sepolicy/vendor/fastbootd.te b/universal7885-common/sepolicy/vendor/fastbootd.te
deleted file mode 100644
index 8e1028d..0000000
--- a/universal7885-common/sepolicy/vendor/fastbootd.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow fastbootd {
-    userdata_block_device
-    system_block_device
-}:blk_file rw_file_perms;
diff --git a/universal7885-common/sepolicy/vendor/hal_camera_default.te b/universal7885-common/sepolicy/vendor/hal_camera_default.te
index 2f08c85..9938b91 100644
--- a/universal7885-common/sepolicy/vendor/hal_camera_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_camera_default.te
@@ -14,6 +14,7 @@ allow hal_camera_default sysfs_battery_writable:file r_file_perms;
 get_prop(hal_camera_default, exported_camera_prop)
 set_prop(hal_camera_default, vendor_camera_prop)
 get_prop(hal_camera_default, exported_default_prop)
+get_prop(hal_camera_default, vendor_factory_prop)
 
 binder_call(hal_camera_default, system_server)
 binder_call(system_server, hal_camera_default)
diff --git a/universal7885-common/sepolicy/vendor/property_contexts b/universal7885-common/sepolicy/vendor/property_contexts
index e6de4e7..f290cb2 100644
--- a/universal7885-common/sepolicy/vendor/property_contexts
+++ b/universal7885-common/sepolicy/vendor/property_contexts
@@ -29,10 +29,14 @@ persist.rmnet.              u:object_r:persist_rmnet_prop:s0
 persist.data.df.            u:object_r:persist_data_df_prop:s0
 persist.data.wda.           u:object_r:persist_data_wda_prop:s0
 
+# CSC
+ro.csc.          	     u:object_r:exported_default_prop:s0
+
 # CAMERA
 persist.sys.camera.         u:object_r:camera_prop:s0
 persist.vendor.sys.camera.  u:object_r:vendor_camera_prop:s0
-vendor.camera.aux.          u:object_r:exported_camera_prop:s0
+persist.vendor.camera.      u:object_r:vendor_camera_prop:s0
+vendor.camera.             u:object_r:exported_camera_prop:s0
 
 # Charger
 ro.charger.enable_suspend      u:object_r:exported_default_prop:s0
@@ -41,6 +45,7 @@ ro.charger.enable_suspend      u:object_r:exported_default_prop:s0
 ro.product_ship                u:object_r:exported_default_prop:s0
 ro.debug_level                 u:object_r:exported_default_prop:s0
 ro.hardware.chipname           u:object_r:exported_default_prop:s0
+ro.build.PDA                   u:object_r:exported_default_prop:s0
 
 # GPS
 ro.spid.gps.                u:object_r:vendor_gps_prop:s0
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index a466a4f..60a2c2c 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -72,10 +72,6 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.2.vendor \
     android.hardware.drm@1.3.vendor
 
-# fastbootd
-PRODUCT_PACKAGES += \
-    fastbootd
-
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \