diff --git a/prebuilt/common/bin/fix_permissions b/prebuilt/common/bin/fix_permissions
index a6db514..1bd6261 100755
--- a/prebuilt/common/bin/fix_permissions
+++ b/prebuilt/common/bin/fix_permissions
@@ -61,8 +61,8 @@
 
 # Initialise vars
 CODEPATH=""
-UID=""
-GID=""
+LOCALUID=""
+LOCALGID=""
 PACKAGE=""
 REMOVE=0
 NOSYSTEM=0
@@ -295,14 +295,14 @@
    endnum=$3
    CODEPATH=$( $ECHO $pkgline | $SED 's%.* codePath="\(.*\)".*%\1%' |  $CUT -d '"' -f1 )
    PACKAGE=$( $ECHO $pkgline | $SED 's%.* name="\(.*\)".*%\1%' | $CUT -d '"' -f1 )
-   UID=$( $ECHO $pkgline | $SED 's%.*serId="\(.*\)".*%\1%' |  $CUT -d '"' -f1 )
-   GID=$UID
+   LOCALUID=$( $ECHO $pkgline | $SED 's%.*serId="\(.*\)".*%\1%' |  $CUT -d '"' -f1 )
+   LOCALGID=$LOCALUID
    APPDIR=$( $ECHO $CODEPATH | $SED 's%^\(.*\)/.*%\1%' )
    APK=$( $ECHO $CODEPATH | $SED 's%^.*/\(.*\..*\)$%\1%' )
    
    #debug
    if $TEST $DEBUG -eq 1; then
-      fp_print "CODEPATH: $CODEPATH APPDIR: $APPDIR APK:$APK UID/GID:$UID:$GID"
+      fp_print "CODEPATH: $CODEPATH APPDIR: $APPDIR APK:$APK UID/GID:$LOCALUID:$LOCALGID"
    fi
    
    #check for existence of apk
@@ -331,7 +331,7 @@
          fp_chmod $OLD_PER "rw-r--r--" 644 "$CODEPATH"
          elif $TEST "$APPDIR" = "/data/app-private" || $TEST "$APPDIR" = "/sd-ext/app-private"; then
          fp_chown_uid $OLD_UID 1000 "$CODEPATH"
-         fp_chown_gid $OLD_GID $GID "$CODEPATH"
+         fp_chown_gid $OLD_GID $LOCALGID "$CODEPATH"
          fp_chmod $OLD_PER "rw-r-----" 640 "$CODEPATH"
       fi
    else
@@ -361,11 +361,11 @@
          ISLIB=0
          REVPERM=755
          REVPSTR="rwxr-xr-x"
-         REVUID=$UID
-         REVGID=$GID
+         REVUID=$LOCALUID
+         REVGID=$LOCALGID
          
          if $TEST "$FOURDIR" = ""; then
-            #package directory, perms:755 owner:$UID:$GID
+            #package directory, perms:755 owner:$LOCALUID:$LOCALGID
             fp_chmod $OLD_PER "rwxr-xr-x" 755 "$FILEDIR"
             elif $TEST "$FOURDIR" = "lib"; then
             #lib directory, perms:755 owner:1000:1000
@@ -377,25 +377,25 @@
             REVGID=1000
             fp_chmod $OLD_PER "rwxr-xr-x" 755 "$FILEDIR"
             elif $TEST "$FOURDIR" = "shared_prefs"; then
-            #shared_prefs directories, perms:771 owner:$UID:$GID
-            #shared_prefs files, perms:660 owner:$UID:$GID
+            #shared_prefs directories, perms:771 owner:$LOCALUID:$LOCALGID
+            #shared_prefs files, perms:660 owner:$LOCALUID:$LOCALGID
             REVPERM=660
             REVPSTR="rw-rw----"
             fp_chmod $OLD_PER "rwxrwx--x" 771 "$FILEDIR"
             elif $TEST "$FOURDIR" = "databases"; then
-            #databases directories, perms:771 owner:$UID:$GID
-            #databases files, perms:660 owner:$UID:$GID
+            #databases directories, perms:771 owner:$LOCALUID:$LOCALGID
+            #databases files, perms:660 owner:$LOCALUID:$LOCALGID
             REVPERM=660
             REVPSTR="rw-rw----"
             fp_chmod $OLD_PER "rwxrwx--x" 771 "$FILEDIR"
             elif $TEST "$FOURDIR" = "cache"; then
-            #cache directories, perms:771 owner:$UID:$GID
-            #cache files, perms:600 owner:$UID:GID
+            #cache directories, perms:771 owner:$LOCALUID:$LOCALGID
+            #cache files, perms:600 owner:$LOCALUID:$LOCALGID
             REVPERM=600
             REVPSTR="rw-------"
             fp_chmod $OLD_PER "rwxrwx--x" 771 "$FILEDIR"
          else
-            #other directories, perms:771 owner:$UID:$GID
+            #other directories, perms:771 owner:$LOCALUID:$LOCALGID
             REVPERM=771
             REVPSTR="rwxrwx--x"
             fp_chmod $OLD_PER "rwxrwx--x" 771 "$FILEDIR"
@@ -406,8 +406,8 @@
             fp_chown_uid $OLD_UID 1000 "$FILEDIR"
             fp_chown_gid $OLD_GID 1000 "$FILEDIR"
          else
-            fp_chown_uid $OLD_UID $UID "$FILEDIR"
-            fp_chown_gid $OLD_GID $GID "$FILEDIR"
+            fp_chown_uid $OLD_UID $LOCALUID "$FILEDIR"
+            fp_chown_gid $OLD_GID $LOCALGID "$FILEDIR"
          fi
          
          #if any files exist in directory with improper permissions reset them
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 571e250..684de27 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -702,6 +702,7 @@
   <apn carrier="Siminn MMS" mcc="274" mnc="01" apn="mms.simi.is" user="" server="" password="" mmsc="http://mms.simi.is/servlets/mms" mmsproxy="213.167.138.200" mmsport="9201" type="mms"/>
   <apn carrier="Si.mobil Internet" mcc="293" mnc="40" apn="internet.simobil.si" user="simobil" server="" password="internet" mmsproxy="" mmsport="" mmsc="" proxy="80.95.224.46" port="9201" type="default,supl" />
   <apn carrier="Si.mobil MMS" mcc="293" mnc="40" apn="mms.simobil.si" user="simobil" server="" password="internet" mmsproxy="80.95.224.46" mmsport="9201" mmsc="mmc" proxy="" port="" type="mms" />
+  <apn carrier="Simple" mcc="310" mnc="260" apn="simple" proxy="216.155.165.050" port="8080" user="" password="" server="" mmsc="http://smpl.mms.msg.eng.t-mobile.com/mms/wapenc" mmsproxy="216.155.165.050" mmsport="8080" type=""/>
   <apn carrier="Simyo DE" apn="internet.eplus.de" type="" user="simyo" pass="simyo"/>
   <apn carrier="Simyo ES" apn="gprs-service.com" mcc="214" mnc="19" type="default,supl"/>
   <apn carrier="Simyo ES-MMS" apn="gprs-service.com" password="1234" mmsc="http://mms-services.eu" mmsproxy="217.12.32.180" mmsport="8080" mcc="214" mnc="19" type="mms"/>
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 1d1f7f4..b5b6e42 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -20,6 +20,11 @@
 PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map
 
 #
+# Move dalvik cache to data partition where there is more room to solve startup problems
+#
+PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1
+
+#
 # Set ro.modversion
 #