diff --git a/install.inc b/install.inc
index 3b9208c..95b2b4f 100644
--- a/install.inc
+++ b/install.inc
@@ -8,6 +8,8 @@ function download_version()
     local release_version="$1"
     local drive="$2"
     local downloads=~/Downloads
+
+    mkdir -p "$downloads"
     pushd "$downloads"
 
     download_and_verify "$release_version" boot-kernel
@@ -34,6 +36,8 @@ function install_version()
     local target
     local downloads=~/Downloads
 
+    mkdir -p "$downloads"
+
     find_unused "$drive"
     target="$unused"
     if [ -z "$unused" ]; then
diff --git a/syslinux.inc b/syslinux.inc
index 321514a..129e288 100644
--- a/syslinux.inc
+++ b/syslinux.inc
@@ -5,6 +5,9 @@ function dev_from_partnum()
     local drive="$1"
     local partnum="$2"
     partition="$drive""$partnum"
+    until [ -b "$drive"1 ] || [ -b "$drive"p1 ]; do
+        sleep 1
+    done
     if [ ! -b "$partition" ]; then
         partition="$drive"p"$partnum"
         if [ ! -b "$partition" ]; then
@@ -49,7 +52,6 @@ function install_syslinux()
     dd bs=440 count=1 conv=notrunc \
         if=/usr/lib/syslinux/mbr/gptmbr.bin of="$drive"
     sync
-    sleep 5
 
     mount_efi "$drive"