diff --git a/products/common.mk b/products/common.mk
index 502d3da2..e5e85fea 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -23,6 +23,16 @@ TINY_TOOLBOX:=true
 # Enable Windows Media if supported by the board
 WITH_WINDOWS_MEDIA:=true
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
+    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
+    ro.com.google.clientidbase=android-google \
+    ro.com.android.wifi-watchlist=GoogleGuest \
+    ro.setupwizard.enterprise_mode=1 \
+    ro.com.android.dateformat=MM-dd-yyyy \
+    ro.com.android.dataroaming=false
+
+# ADWLauncher is the default unless specified elsewhere
 ifndef DEFAULT_LAUNCHER
     PRODUCT_PACKAGES += ADWLauncher
 endif
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 3aac6527..c249d9c5 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -18,6 +18,12 @@ PRIVATE_BUILD_DESC="passion-user 2.2 FRF85B 42745 release-keys"
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
 
+# Extra RIL settings
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.ril.enable.managed.roaming=1 \
+    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
+    ro.ril.emc.mode=2
+
 #
 # Set ro.modversion
 #
@@ -26,7 +32,7 @@ ifdef CYANOGEN_NIGHTLY
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-N1-alpha1
+        ro.modversion=CyanogenMod-6.0.0-N1-alpha2
 endif
 
 #