diff --git a/tools/branch-deploy.sh b/tools/branch-deploy.sh
index 698a802..8c9de25 100755
--- a/tools/branch-deploy.sh
+++ b/tools/branch-deploy.sh
@@ -16,6 +16,11 @@ THEMES="lhs lhs-retro"
 # Ensure the target folder exists
 mkdir -p "${TARGET_FOLDER}"
 
+# Clear out target folder, and put a boilerplate index in while we're building
+rm -rf ${TARGET_FOLDER}/*
+INDEX_PAGE="${TARGET_FOLDER}/index.html"
+echo "<meta http-equiv="refresh" content="5"><p>Deploying...</p>" > "${INDEX_PAGE}"
+
 # Checkout a local bare copy, to speed up later checkouts
 ORIGIN=$(git config --get remote.origin.url)
 BARE_FOLDER=`mktemp -u -d`
@@ -41,15 +46,14 @@ for BRANCH in $BRANCHES; do
     # Build to the destination folder
     for THEME in $THEMES; do
         hugo --quiet ${HUGO_ARGUMENTS} -b "${BASE_URL}/${BRANCH}/${THEME}" -s "${TEMP_FOLDER}" -d "${TARGET_FOLDER}/${BRANCH}/${THEME}" -t "${THEME}"
+        find "${TARGET_FOLDER}/${BRANCH}/${THEME}" -name "*.cgi" -exec chmod a+x {}\;
     done
 
     # Cleanup the temp folder
     rm -rf "${TEMP_FOLDER}"
 done
 
-# Build the index page
-INDEX_PAGE="${TARGET_FOLDER}/index.html"
-
+# Build the full index page
 echo -e "<h1>Branches</h1>\n<ul>" > "${INDEX_PAGE}"
 for BRANCH in $BRANCHES; do
     echo "  <li>${BRANCH} - " >> "${INDEX_PAGE}"
diff --git a/tools/retro-deploy.sh b/tools/retro-deploy.sh
index efda8e1..b764a6c 100755
--- a/tools/retro-deploy.sh
+++ b/tools/retro-deploy.sh
@@ -13,4 +13,4 @@ git pull
 hugo --quiet ${HUGO_ARGUMENTS} -b "${BASE_URL}" -d "${TARGET_FOLDER}" -t "lhs-retro"
 
 # Make sure the CGI scripts are executable
-find "${TARGET_FOLDER}" -name "*.cgi" -exec chmod a+x \;
\ No newline at end of file
+find "${TARGET_FOLDER}" -name "*.cgi" -exec chmod a+x {}\;
\ No newline at end of file