diff --git a/dropshell-build/src/dropshell-build b/dropshell-build/src/dropshell-build
index 765e2a4..f20b788 100755
--- a/dropshell-build/src/dropshell-build
+++ b/dropshell-build/src/dropshell-build
@@ -233,11 +233,11 @@ function buildspawn() {
             echo "PWD:                ${PWD}"
             echo "JOB_CONTAINER_NAME: ${JOB_CONTAINER_NAME}"
 
-            docker run --rm -i --entrypoint /bin/bash \
+            docker run --rm \
                 --volumes-from="${JOB_CONTAINER_NAME}" \
                 "gitea.jde.nz/public/dropshell-build:${TAG}" \
                 bash -c "rm -rf /app && \
-                    ln -s ${GITHUB_WORKSPACE} /app && \
+                    ln -s ${BUILD_DIR} /app && \
                     dropshell-build $FLAGS /app"
         else
             echo "Running locally"
@@ -249,7 +249,8 @@ function buildspawn() {
         fi
     else    
         echo "Using local native buildchain"
-        bash -c "build $FLAGS $BUILD_DIR"
+        # shellcheck disable=SC2086
+        build $FLAGS $BUILD_DIR
     fi   
 }
 
diff --git a/dropshell-build/src/install_dropshell_build_requirements b/dropshell-build/src/install_dropshell_build_requirements
index bd120ee..672ea34 100755
--- a/dropshell-build/src/install_dropshell_build_requirements
+++ b/dropshell-build/src/install_dropshell_build_requirements
@@ -120,7 +120,9 @@ function install_packages() {
 
 function install_headers() {
     # put libassert headers on the host.
-    if [ ! -f /usr/local/lib/libassert.a ]; then
+    echo "Checking for libassert headers"
+    if [ ! -f "/usr/local/lib/libassert.a" ]; then
+        echo "libassert not found, installing..."
         git clone https://github.com/jeremy-rifkin/libassert.git
         #git checkout v2.1.5
         mkdir libassert/build
@@ -130,6 +132,8 @@ function install_headers() {
         ${SUDOCMD:-} make install
         cd ../..
         rm -rf libassert
+    else
+        echo "libassert headers already installed"
     fi
 }
 
@@ -212,10 +216,12 @@ function install_openssl_musl() {
             else
                 echo "No opensslv.h found, will rebuild."
             fi
+        else
+            echo "No libssl.a found, will rebuild."
         fi
 
         if [ "$SKIP_BUILD" -eq 1 ]; then
-            echo
+            echo "Skipping build for $ARCH."
             continue
         fi
 
@@ -228,9 +234,7 @@ function install_openssl_musl() {
         fi
         cd "openssl-${OPENSSL_VERSION}"
 
-        # Clean previous build for this arch
-        make clean || true
-
+        echo "----------------------------------------------"    
         echo "Configuring for $ARCH with sysroot $SYSROOT..."
         CC="$CC" AR="$AR" RANLIB="$RANLIB" ./Configure "$OPENSSL_TARGET" no-shared --prefix="$SYSROOT/usr"
         echo "Building..."
@@ -282,6 +286,8 @@ function install_musl_cross() {
         echo "Downloading $TOOLCHAIN musl cross toolchain..."
         wget -nc -O "$TMPDIR/$TOOLCHAIN.tgz" "$MUSL_CC_URL/$TOOLCHAIN.tgz:latest"
         tar -C "$INSTALL_DIR" -xvf "$TMPDIR/$TOOLCHAIN.tgz"
+    else
+        echo "$TOOLCHAIN musl cross toolchain already installed"
     fi
 }