diff --git a/extendedcommands.c b/extendedcommands.c
index 8a37ae1..1f882c5 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -491,7 +491,7 @@ int is_safe_to_format(char* name)
 {
     char str[255];
     char* partition;
-    property_get("ro.cwm.forbid_format", str, "/misc,/radio,/bootloader,/recovery");
+    property_get("ro.cwm.forbid_format", str, "/misc,/radio,/bootloader,/recovery,/efs");
 
     partition = strtok(str, ", ");
     while (partition != NULL) {
diff --git a/recovery.c b/recovery.c
index 3fe7806..2e77ec6 100644
--- a/recovery.c
+++ b/recovery.c
@@ -786,7 +786,11 @@ main(int argc, char **argv) {
 		return busybox_driver(argc, argv);
 	}
     __system("/sbin/postrecoveryboot.sh");
-    
+    if (volume_for_path("/sdcard") == NULL) {
+        rmdir("/sdcard");
+        symlink("/data/media", "/sdcard");
+    }
+
     int is_user_initiated_recovery = 0;
     time_t start = time(NULL);