diff --git a/scripts/test-openssl.sh b/scripts/test-openssl.sh
index d6fc2087..7a4da19a 100755
--- a/scripts/test-openssl.sh
+++ b/scripts/test-openssl.sh
@@ -285,14 +285,16 @@ if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
 fi
 make -j$NUMCPU &>> $LOG_FILE
 if [ $? != 0 ]; then
-  tail -n 20 $LOG_FILE
+  printf "\n\n...\n"
+  tail -n 40 $LOG_FILE
   do_cleanup
   exit 1
 fi
 
 make test &>> $LOG_FILE
 if [ $? != 0 ]; then
-  tail -n 20 $LOG_FILE
+  printf "\n\n...\n"
+  tail -n 40 $LOG_FILE
   do_cleanup
   exit 1
 fi
diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh
index 5c484fdb..16e634a5 100755
--- a/scripts/utils-openssl.sh
+++ b/scripts/utils-openssl.sh
@@ -24,11 +24,19 @@
 #
 
 OPENSSL_GIT="https://github.com/openssl/openssl.git"
-OPENSSL_TAG="openssl-3.0.0"
+OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.0.0"}
 OPENSSL_SOURCE_DIR=$PWD/openssl-source
 OPENSSL_INSTALL_DIR=$PWD/openssl-install
 
 install_openssl() {
+    if [ -d ${OPENSSL_SOURCE_DIR} ]; then
+        if [ "$(cd ${OPENSSL_SOURCE_DIR} && git describe --tags)" != "${OPENSSL_TAG}" ]; then # force a rebuild
+            printf "Version inconsistency. Please fix ${OPENSSL_SOURCE_DIR}\n"
+            do_cleanup
+            exit 1
+        fi
+    fi
+
     if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then
         printf "\tClone OpenSSL ${OPENSSL_TAG} ... "
         git clone --depth=1 -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
@@ -42,34 +50,38 @@ install_openssl() {
     fi
 
     cd ${OPENSSL_SOURCE_DIR}
+
     if [ ! -d ${OPENSSL_INSTALL_DIR} ]; then
         printf "\tConfigure OpenSSL ${OPENSSL_TAG} ... "
         ./config shared --prefix=${OPENSSL_INSTALL_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
+            rm -rf ${OPENSSL_INSTALL_DIR}
             do_cleanup
             exit 1
         fi
         printf "Done.\n"
-    fi
 
-    printf "\tBuild OpenSSL ${OPENSSL_TAG} ... "
-    make -j$NUMCPU &>> $LOG_FILE
-    if [ $? != 0 ]; then
-        printf "ERROR.\n"
-        do_cleanup
-        exit 1
-    fi
-    printf "Done.\n"
+        printf "\tBuild OpenSSL ${OPENSSL_TAG} ... "
+        make -j$NUMCPU &>> $LOG_FILE
+        if [ $? != 0 ]; then
+            printf "ERROR.\n"
+            rm -rf ${OPENSSL_INSTALL_DIR}
+            do_cleanup
+            exit 1
+        fi
+        printf "Done.\n"
 
-    printf "\tInstalling OpenSSL ${OPENSSL_TAG} ... "
-    make -j$NUMCPU install &>> $LOG_FILE
-    if [ $? != 0 ]; then
-        printf "ERROR.\n"
-        do_cleanup
-        exit 1
+        printf "\tInstalling OpenSSL ${OPENSSL_TAG} ... "
+        make -j$NUMCPU install &>> $LOG_FILE
+        if [ $? != 0 ]; then
+            printf "ERROR.\n"
+            rm -rf ${OPENSSL_INSTALL_DIR}
+            do_cleanup
+            exit 1
+        fi
+        printf "Done.\n"
     fi
-    printf "Done.\n"
 
     cd ..
 }
diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh
index 3b54491d..9cfe4095 100755
--- a/scripts/utils-wolfssl.sh
+++ b/scripts/utils-wolfssl.sh
@@ -24,12 +24,20 @@
 #
 
 WOLFSSL_GIT="https://github.com/wolfSSL/wolfssl.git"
-WOLFSSL_TAG="v5.0.0-stable"
+WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.6.3-stable"}
 WOLFSSL_SOURCE_DIR=$PWD/wolfssl-source
 WOLFSSL_INSTALL_DIR=$PWD/wolfssl-install
 
 # Depends on OPENSSL_INSTALL_DIR
 install_wolfssl() {
+    if [ -d ${WOLFSSL_SOURCE_DIR} ]; then
+        if [ "$(cd ${WOLFSSL_SOURCE_DIR} && git describe --tags)" != "${WOLFSSL_TAG}" ]; then # force a rebuild
+            printf "Version inconsistency. Please fix ${WOLFSSL_SOURCE_DIR}\n"
+            do_cleanup
+            exit 1
+        fi
+    fi
+
     if [ ! -d ${WOLFSSL_SOURCE_DIR} ]; then
         printf "\tClone wolfSSL ${WOLFSSL_TAG} ... "
         git clone --depth=1 -b ${WOLFSSL_TAG} ${WOLFSSL_GIT} \
@@ -43,6 +51,7 @@ install_wolfssl() {
     fi
 
     cd ${WOLFSSL_SOURCE_DIR}
+
     if [ ! -d ${WOLFSSL_INSTALL_DIR} ]; then
         printf "\tConfigure wolfSSL ${WOLFSSL_TAG} ... "
         if [ -z "$WOLFSSL_CONFIG_OPTS" ]; then
@@ -54,29 +63,32 @@ install_wolfssl() {
         ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
+            rm -rf ${WOLFSSL_INSTALL_DIR}
             do_cleanup
             exit 1
         fi
         printf "Done.\n"
-    fi
 
-    printf "\tBuild wolfSSL ${WOLFSSL_TAG} ... "
-    make -j$NUMCPU &>> $LOG_FILE
-    if [ $? != 0 ]; then
-        printf "ERROR.\n"
-        do_cleanup
-        exit 1
-    fi
-    printf "Done.\n"
+        printf "\tBuild wolfSSL ${WOLFSSL_TAG} ... "
+        make -j$NUMCPU &>> $LOG_FILE
+        if [ $? != 0 ]; then
+            printf "ERROR.\n"
+            rm -rf ${WOLFSSL_INSTALL_DIR}
+            do_cleanup
+            exit 1
+        fi
+        printf "Done.\n"
 
-    printf "\tInstalling wolfSSL ${WOLFSSL_TAG} ... "
-    make -j$NUMCPU install &>> $LOG_FILE
-    if [ $? != 0 ]; then
-        printf "ERROR.\n"
-        do_cleanup
-        exit 1
+        printf "\tInstalling wolfSSL ${WOLFSSL_TAG} ... "
+        make -j$NUMCPU install &>> $LOG_FILE
+        if [ $? != 0 ]; then
+            printf "ERROR.\n"
+            rm -rf ${WOLFSSL_INSTALL_DIR}
+            do_cleanup
+            exit 1
+        fi
+        printf "Done.\n"
     fi
-    printf "Done.\n"
 
     cd ..
 }