diff --git a/README b/README
index 015dfab..50b04bf 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@
 
 # Initial setup, part 1: build fastboot
 source build/envsetup.sh
-lunch full_panda_userdebug
+lunch full_panda-userdebug
 make fastboot
 
 # Initial setup, part 2:
@@ -40,7 +40,7 @@
 
 # Build and flash, part 1: Do a build
 source build/envsetup.sh
-lunch full_panda_userdebug
+lunch full_panda-userdebug
 make
 
 # Build and flash, part 2: Flash
diff --git a/init.omap4pandaboard.rc b/init.omap4pandaboard.rc
index 6a2e0c8..0246491 100644
--- a/init.omap4pandaboard.rc
+++ b/init.omap4pandaboard.rc
@@ -1,16 +1,20 @@
 import init.omap4pandaboard.usb.rc
 
 on init
-    mkdir /mnt/secure/sdcard0 0700 root root
+    mkdir /mnt/shell/sdcard0 0700 shell shell
 
+    # External storage path for apps
     export EXTERNAL_STORAGE /storage/sdcard0
+    # External storage path for adb
+    export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0
+
     mkdir /storage 0711 root root
     mkdir /storage/sdcard0 0000 root root
     symlink /storage/sdcard0 /sdcard
     symlink /storage/sdcard0 /mnt/sdcard
 
     # Save bugreports as owner
-    export BUGREPORT_WRITE_PATH /mnt/secure/sdcard0/0
+    export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0
     export BUGREPORT_READ_PATH /storage/sdcard0
 
 on post-fs-data
@@ -68,7 +72,7 @@
 	group bluetooth net_bt_admin
 
 # virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/secure/sdcard0 1023 1023
+service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023
     class late_start
 
 service wpa_supplicant /system/bin/wpa_supplicant -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf -dd