diff --git a/adb/sockets.c b/adb/sockets.c
index ce3c65e..91db951 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -426,11 +426,14 @@
     s = create_local_socket(fd);
     D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);
 
-    if (!strcmp(name, "root:") || !strcmp(name, "usb:") ||
-                                  !strcmp(name, "tcpip:")) {
+#if !ADB_HOST
+    if ((!strcmp(name, "root:") && getuid() != 0)
+        || !strcmp(name, "usb:")
+        || !strcmp(name, "tcpip:")) {
         D("LS(%d): enabling exit_on_close\n", s->id);
         s->exit_on_close = 1;
     }
+#endif
 
     return s;
 }
diff --git a/fastboot/engine.c b/fastboot/engine.c
index 93d24bc..994eeae 100644
--- a/fastboot/engine.c
+++ b/fastboot/engine.c
@@ -257,7 +257,7 @@
 #endif
     reset_ext4fs_info();
     info.len = image->partition_size;
-    make_ext4fs_internal(fd, NULL, NULL, 0, 0, 1, 0, 0, 0);
+    make_ext4fs_internal(fd, NULL, NULL, NULL, 0, 1, 0, 0, 0, NULL);
 
     fstat(fd, &st);
     image->image_size = st.st_size;