diff --git a/scripts/build_image/build_alpine.bash b/scripts/build_image/build_alpine.bash
index 5c6ef0b..3542f0b 100755
--- a/scripts/build_image/build_alpine.bash
+++ b/scripts/build_image/build_alpine.bash
@@ -18,7 +18,7 @@ function cleanup {
     done
     for (( idx=${#mountedfolders[@]}-1 ; idx>=0 ; idx-- )) ; do
         >&2 echo "Unmounting folder ${mountedfolders[idx]}"
-        umount -f "${mountedfolders[idx]}"
+        umount "${mountedfolders[idx]}"
     done
     for f in "${memorydevices[@]}"; do
         >&2 echo "Removing memory device $f"
diff --git a/scripts/launch_bhyve.bash b/scripts/launch_bhyve.bash
index 77fbd3b..19d12aa 100755
--- a/scripts/launch_bhyve.bash
+++ b/scripts/launch_bhyve.bash
@@ -34,7 +34,7 @@ ifconfig bridge0 addm tap1
 # -s virtual PCI slots
 # -P force guest CPU to exit when PAUSE instruction detected
 set +e
-disk_image=$(readlink -f ../scripts/build_image/dib.img)
+disk_image=$(readlink -f "$DIR/../scripts/build_image/dib.img")
 bhyve \
     -c 1 \
     -m 1024M \
@@ -45,7 +45,7 @@ bhyve \
     -u \
     -s 0,hostbridge \
     -s 31,lpc \
-    -s 4:0,virtio-blk,$disk_image \
+    -s "4:0,virtio-blk,$disk_image" \
     -s 5:0,virtio-net,tap1,mac=58:9c:fc:09:c3:ba \
     -s 6:0,virtio-rnd \
     -s "7:0,virtio-9p,docker=$DOCKERDIR" \