diff --git a/scripts_debian/04_install_qubes.sh b/scripts_debian/04_install_qubes.sh
index 6c94531..c1858d4 100755
--- a/scripts_debian/04_install_qubes.sh
+++ b/scripts_debian/04_install_qubes.sh
@@ -141,7 +141,7 @@ EOF
     # Install Qubes packages
     # --------------------------------------------------------------------------
     DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
-        chroot "$INSTALLDIR" apt-get -y --force-yes install `cat $SCRIPTSDIR/packages_qubes.list` || \
+        chroot "$INSTALLDIR" apt-get -y --force-yes install $(cat $SCRIPTSDIR/packages_qubes.list) || \
         { umount_kill "$INSTALLDIR"; exit 1; }
 
     # --------------------------------------------------------------------------
diff --git a/scripts_debian/vars.sh b/scripts_debian/vars.sh
index aeb5940..b2450b1 100755
--- a/scripts_debian/vars.sh
+++ b/scripts_debian/vars.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # ------------------------------------------------------------------------------
 # Global variables and functions
 # ------------------------------------------------------------------------------
diff --git a/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh b/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
index 1825da1..2639417 100755
--- a/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
+++ b/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
@@ -281,9 +281,6 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
     # ------------------------------------------------------------------------------
     copyTree "extra-whonix-files"
 
-    # XXX: Temp debug to see if it copied over files okay
-    #exit 1
-
     # --------------------------------------------------------------------------
     # Install Whonix system
     # --------------------------------------------------------------------------
@@ -355,6 +352,16 @@ if [ -L "$INSTALLDIR/usr/bin/apt-get" ]; then
     chroot "$INSTALLDIR" su -c "cd /usr/bin/; ln -s apt-get.anondist-orig apt-get"
 fi
 
+# ------------------------------------------------------------------------------
+# Make sure the temporary policy-rc.d to prevent apt from starting services
+# on package installation is still active; Whonix may have reset it
+# ------------------------------------------------------------------------------
+cat > "$INSTALLDIR/usr/sbin/policy-rc.d" <<EOF
+#!/bin/sh
+return 101 # Action forbidden by policy
+EOF
+chmod 755 "$INSTALLDIR/usr/sbin/policy-rc.d"
+
 # ------------------------------------------------------------------------------
 # Leave cleanup to calling function
 # ------------------------------------------------------------------------------
diff --git a/tests/shellcheck/INSTALL b/tests/shellcheck/INSTALL
new file mode 100755
index 0000000..a643fee
--- /dev/null
+++ b/tests/shellcheck/INSTALL
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# https://github.com/koalaman/shellcheck
+
+sudo yum install cabal-install
+
+# Let cabal update itself, incase your distro is outdated
+sudo cabal update
+cabel install cabal-install
+
+# Clone shellcheck and build
+git clone https://github.com/koalaman/shellcheck.git
+cd shellcheck
+
+# With cabel installed, cd to source direstory and:
+sudo cabal install
+
+# Add cabal directory to bash path
+source='export PATH=$HOME/.cabal/bin:$PATH'
+file=~/.bash_profile
+if ! grep -r -q "$source" "${file}"; then
+    touch $file
+    echo "$source" >> $file
+fi
+
+# You now need to manually source .bash_profile
+echo "You now need to manually source .bash_profile"
+echo "source ~/.bash_profile"
+
+# Then verify PATH is set correctly
+echo
+echo
+echo "Then verify PATH is set correctly"
+echo "which shellcheck"
+echo "~/.cabal/bin/shellcheck"
+
+
+# To run the unit test suite:
+#
+# cabal configure --enable-tests
+# cabal build
+# cabal test