diff --git a/scripts/cleanup-env.sh b/scripts/cleanup-env.sh
index 61c7573..d2d5729 100755
--- a/scripts/cleanup-env.sh
+++ b/scripts/cleanup-env.sh
@@ -1,8 +1,14 @@
 #!/bin/bash -x
 
+sudo fuser -m `pwd`/build
+
 # Only attempt to unmount if the directory is already mounted
 if mountpoint -q `pwd`/build; then
-    sudo umount build
+    sudo umount `pwd`/build
 fi
 
+sudo fuser -m `pwd`/build
+
+ps -ef
+
 exit 0
diff --git a/scripts/publish-build-cache.sh b/scripts/publish-build-cache.sh
index 871d97d..e3a0a18 100755
--- a/scripts/publish-build-cache.sh
+++ b/scripts/publish-build-cache.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -x
 
 if [[ $# -lt 1 ]]; then
     echo "No Yocto branch specified, defaulting to master"