diff --git a/build/phing/build.xml b/build/phing/build.xml
index 0caadcf8c..d9e4e7012 100644
--- a/build/phing/build.xml
+++ b/build/phing/build.xml
@@ -153,6 +153,8 @@
     <echo>4. Run the following command from the new project root:</echo>
     <echo>./blt.sh local:setup</echo>
     <echo></echo>
+    <echo>Follow the documentation in ${blt.new.dir}/README.md for anything else.</echo>
+    <echo></echo>
   </target>
 
   <!-- This target is meant to test BLT itself on TravisCI.
diff --git a/template/build/core/phing/tasks/deploy.xml b/template/build/core/phing/tasks/deploy.xml
index 473f28ff2..80735ae6b 100644
--- a/template/build/core/phing/tasks/deploy.xml
+++ b/template/build/core/phing/tasks/deploy.xml
@@ -128,8 +128,8 @@
   </target>
 
   <target name="deploy:sanitize" description="Removes sensitive files from the deploy docroot.">
-    <exec command="find . -type d | grep .git | xargs rm -rf" dir="${deploy.dir}/docroot"/>
-    <exec command="find . -type d | grep .git | xargs rm -rf" dir="${deploy.dir}/vendor"/>
+    <exec command="find . -type d | grep '\.git' | xargs rm -rf" dir="${deploy.dir}/docroot"/>
+    <exec command="find . -type d | grep '\.git' | xargs rm -rf" dir="${deploy.dir}/vendor"/>
     <delete>
       <fileset dir="${deploy.dir}/docroot">
         <include name="core/*.txt"/>
diff --git a/template/drush.wrapper b/template/drush.wrapper
index 07e1e8569..db0b54e48 100755
--- a/template/drush.wrapper
+++ b/template/drush.wrapper
@@ -37,4 +37,4 @@ if [ ! -f ${DIR}/vendor/bin/drush ]; then
   composer install
 fi
 
-vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@"
+vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@" -r ${DIR}/docroot
diff --git a/template/tests/phpunit/Bolt/SettingsTest.php b/template/tests/phpunit/Bolt/SettingsTest.php
index 8ea583f23..db8401335 100644
--- a/template/tests/phpunit/Bolt/SettingsTest.php
+++ b/template/tests/phpunit/Bolt/SettingsTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\Tests\PHPUnit;
+
 /**
  * Class SettingsTest.
  *