diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 01a64d87e22..ffa11e6102c 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -110,6 +110,7 @@ else
 endif
 
 	docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
+	rm -rf "${TEMP_DIR}"
 
 push: build
 	gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
diff --git a/hack/dev-push-hyperkube.sh b/hack/dev-push-hyperkube.sh
index 2c7991c818d..f252a04e59c 100755
--- a/hack/dev-push-hyperkube.sh
+++ b/hack/dev-push-hyperkube.sh
@@ -27,7 +27,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
 source "${KUBE_ROOT}/build/common.sh"
 
 if [[ -z "${KUBE_DOCKER_REGISTRY:-}" ]]; then
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
index 78744e23fc8..4aafe51f584 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 # The root of the build/dist directory
-KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/../.. && pwd -P)
+KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)"
 
 KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}"
 KUBE_OUTPUT="${KUBE_ROOT}/${KUBE_OUTPUT_SUBPATH}"