diff --git a/build/envsetup.sh b/build/envsetup.sh
index 574de8a..0b6a27b 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -90,7 +90,7 @@
             return 1
         fi
         echo "Waiting for device..."
-        adb wait-for-online
+        adb wait-for-device-recovery
         echo "Found device"
         if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD"); then
             echo "Rebooting to sideload for install"
@@ -354,9 +354,9 @@
             return 1
         fi
     fi
-    adb wait-for-online
+    adb wait-for-device-recovery
     adb root
-    adb wait-for-online
+    adb wait-for-device-recovery
     if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD");
     then
         adb push $OUT/boot.img /cache/
@@ -392,9 +392,9 @@
             return 1
         fi
     fi
-    adb wait-for-online
+    adb wait-for-device-recovery
     adb root
-    adb wait-for-online
+    adb wait-for-device-recovery
     if (adb shell getprop ro.bliss.device | grep -q "$BLISS_BUILD");
     then
         adb push $OUT/recovery.img /cache/
@@ -794,7 +794,6 @@
         adb connect "$TCPIPPORT"
     fi
     adb wait-for-device &> /dev/null
-    sleep 0.3
     adb remount &> /dev/null
 
     mkdir -p $OUT