diff --git a/build/scripts/crc32.sh b/build/scripts/crc32.sh
index 8c535d2014cecb174e868ce584a3c402d221ea4b..d715ef470643f941f200c9d01e0184198daf4133 100755
--- a/build/scripts/crc32.sh
+++ b/build/scripts/crc32.sh
@@ -65,6 +65,10 @@ build_crc32() {
     rm -f "$CRC32_OUTPUT_DIR/$CRC32_SO_FILE"
 
     read -ra PYBIND11_INCLUDES <<<"$($PYTHON -m pybind11 --includes)"
+    if [ ! -n "${PYBIND11_INCLUDES[0]}" ]; then
+        echo "pybind11 is required"
+        exit 1
+    fi
 
     c++ -O2 -O3 -shared -std=c++11 -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 \
         -Wno-maybe-uninitialized -Wno-unused-parameter -Wall -Wl,-z,relro,-z,now,-z,noexecstack \
diff --git a/build/scripts/ui.sh b/build/scripts/ui.sh
index 295fa69f45f97db6c0b08a636a9dac999ea580d0..923e26503f3af5561ce8383c3809ad81cf0ad256 100755
--- a/build/scripts/ui.sh
+++ b/build/scripts/ui.sh
@@ -25,6 +25,7 @@ build_ui() {
     fi
 
     rm -f package-lock.json
+    rm -rf node_modules
     rm -rf dist
     mkdir -p public/static/js
     cp ../../third_party/hpcc/graphvizlib.wasm public/static/js
@@ -40,8 +41,6 @@ build_ui() {
         echo "dist does not have file index.html, build failed"
         exit 1
     fi
-
-    rm -rf node_modules
 }
 
 build_ui
diff --git a/setup.py b/setup.py
index b83b8e45c55a43068e4b7bfed95219c111dd0843..3078180ab6d199af0afb9b1961c4d92a360e0f73 100644
--- a/setup.py
+++ b/setup.py
@@ -99,20 +99,11 @@ def run_script(script):
     cmd = '/bin/bash {}'.format(script)
     process = subprocess.Popen(
         shlex.split(cmd),
-        shell=False,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
+        shell=False
     )
 
-    while True:
-        line = process.stdout.readline()
-        if not line and process.poll() is not None:
-            break
-        if line:
-            sys.stdout.write(line.decode())
-
-    if process.returncode:
+    rc = process.wait()
+    if rc:
         sys.exit(1)