diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc
index b53d842..3adfaaf 100644
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@@ -9,12 +9,10 @@ on early-init
     symlink /mnt/sdcard /sdcard
 
 on fs
-    mount yaffs2 mtd@system /system remount noatime nodiratime
+    mount yaffs2 mtd@system /system ro remount noatime nodiratime
     mount yaffs2 mtd@userdata /data remount nosuid nodev noatime nodiratime
 
 on post-fs-data
-    mount rootfs rootfs / remount
-
     mkdir /data/misc/wifi 0770 wifi wifi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/dhcp 0770 dhcp dhcp
diff --git a/prebuilt/init.htcleo.usb.rc b/prebuilt/init.htcleo.usb.rc
index 788a266..93e42f5 100644
--- a/prebuilt/init.htcleo.usb.rc
+++ b/prebuilt/init.htcleo.usb.rc
@@ -1,3 +1,11 @@
+on property:sys.usb.config=none
+    exec /system/bin/netcfg usb0 down
+    stop adbd
+    write /sys/class/usb_composite/adb/enable 0
+    write /sys/class/usb_composite/usb_mass_storage/enable 0
+    write /sys/class/usb_composite/rndis/enable 0
+    setprop sys.usb.state $sys.usb.config
+
 on property:sys.usb.config=adb
     write /sys/class/usb_composite/adb/enable 1
     start adbd
@@ -15,12 +23,21 @@ on property:sys.usb.config=mass_storage,adb
     setprop sys.usb.state $sys.usb.config
 
 on property:sys.usb.config=rndis
+    exec /system/bin/netcfg usb0 up
     write /sys/class/usb_composite/rndis/enable 1
     setprop sys.usb.state $sys.usb.config
 
 on property:sys.usb.config=rndis,adb
+    exec /system/bin/netcfg usb0 up
     write /sys/class/usb_composite/rndis/enable 1
     write /sys/class/usb_composite/adb/enable 1
     start adbd
     setprop sys.usb.state $sys.usb.config
 
+on property:sys.usb.config=mass_storage,rndis,adb
+    exec /system/bin/netcfg usb0 up
+    write /sys/class/usb_composite/usb_mass_storage/enable 1
+    write /sys/class/usb_composite/rndis/enable 1
+    write /sys/class/usb_composite/adb/enable 1
+    start adbd
+    setprop sys.usb.state $sys.usb.config