diff --git a/command/base b/command/base
index bb88ec6a..8e144548 100644
--- a/command/base
+++ b/command/base
@@ -15,7 +15,7 @@ QEMU_GIT_COMMIT="49ee115552"
 # reset to blank when QEMU_REV/GIT_COMMIT bumps, otherwise begin count from 1
 QEMU_REV_ZIG_SERIAL=
 
-if [ -n $QEMU_GIT_COMMIT ]; then
+if [ -n "$QEMU_GIT_COMMIT" ]; then
     QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}-${QEMU_GIT_COMMIT}"
 else
     QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}"
@@ -34,6 +34,6 @@ WORKDIR() {
 }
 
 RUN() {
-    echo "run: $@"
+    echo "run: $*"
     "$@"
 }
diff --git a/command/extract b/command/extract
index 3af991fa..cb367cf4 100755
--- a/command/extract
+++ b/command/extract
@@ -4,7 +4,7 @@ set -e
 
 . $(dirname $0)/base
 
-if [ -n $QEMU_GIT_COMMIT ]; then
+if [ -n "$QEMU_GIT_COMMIT" ]; then
     exit 0
 fi
 
diff --git a/command/fetch b/command/fetch
index d3039eaa..0ef78b83 100755
--- a/command/fetch
+++ b/command/fetch
@@ -6,7 +6,7 @@ set -e
 
 WORKDIR /work/src
 
-if [ -n $QEMU_GIT_COMMIT ]; then
+if [ -n "$QEMU_GIT_COMMIT" ]; then
     git clone --no-checkout https://github.com/qemu/qemu.git $QEMU_SRC_BASENAME
     cd $QEMU_SRC_BASENAME
     git checkout $QEMU_GIT_COMMIT