diff --git a/conf/ueventd.gs101.rc b/conf/ueventd.gs101.rc
index d83020fa..5ed8fca1 100644
--- a/conf/ueventd.gs101.rc
+++ b/conf/ueventd.gs101.rc
@@ -75,8 +75,8 @@
 /dev/hdcp2                0660   media      media
 
 # jpeg
-/dev/m2m1shot_jpeg	      0660   media          media
-/dev/video12              0660   cameraserver   media
+/dev/m2m1shot_jpeg	      0660   media      media
+/dev/video12              0660   system     system
 
 # audio
 /dev/seiren                     0660   system     audio
diff --git a/device.mk b/device.mk
index d34bb96a..48543ed8 100644
--- a/device.mk
+++ b/device.mk
@@ -107,7 +107,7 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.telephony.default_network=27 \
 	persist.vendor.ril.use.iccid_to_plmn=1 \
-	persist.vendor.ril.emergencynumber.mode=5
+	persist.vendor.ril.db_ecc.id.type=5
 	#rild.libpath=/system/lib64/libsec-ril.so \
 	#rild.libargs=-d /dev/umts_ipc0