diff --git a/build-tools/build-docker-images/build-stx-base.sh b/build-tools/build-docker-images/build-stx-base.sh
index ae5fba9a..c89fe1e8 100755
--- a/build-tools/build-docker-images/build-stx-base.sh
+++ b/build-tools/build-docker-images/build-stx-base.sh
@@ -223,7 +223,7 @@ BASE_IMAGE_PRESENT=$?
 IMAGE_NAME=${DOCKER_REGISTRY}${DOCKER_USER}/stx-${OS}:${IMAGE_VERSION}
 IMAGE_NAME_LATEST=${DOCKER_REGISTRY}${DOCKER_USER}/stx-${OS}:${LATEST_TAG}
 
-local -a BUILD_ARGS
+declare -a BUILD_ARGS
 BUILD_ARGS+=(--build-arg RELEASE=${OS_VERSION})
 BUILD_ARGS+=(--build-arg REPO_OPTS=${REPO_OPTS})
 
diff --git a/build-tools/build-wheels/build-base-wheels.sh b/build-tools/build-wheels/build-base-wheels.sh
index 20c6ad55..3eb79ff6 100755
--- a/build-tools/build-wheels/build-base-wheels.sh
+++ b/build-tools/build-wheels/build-base-wheels.sh
@@ -195,7 +195,7 @@ docker images --format '{{.Repository}}:{{.Tag}}' ${OS}:${OS_VERSION} | grep -q
 BASE_IMAGE_PRESENT=$?
 
 # Create the builder image
-local -a BUILD_ARGS
+declare -a BUILD_ARGS
 BUILD_ARGS+=(--build-arg RELEASE=${OS_VERSION})
 BUILD_ARGS+=(--build-arg OPENSTACK_RELEASE=${OPENSTACK_RELEASE})
 if [ ! -z "$PROXY" ]; then
@@ -218,7 +218,7 @@ if [ "${KEEP_CONTAINER}" = "no" ]; then
     RM_OPT="--rm"
 fi
 
-local -a RUN_ARGS
+declare -a RUN_ARGS
 if [ ! -z "$PROXY" ]; then
     RUN_ARGS+=(--env http_proxy=$PROXY)
     RUN_ARGS+=(--env https_proxy=$PROXY)
diff --git a/build-tools/build-wheels/build-wheel-tarball.sh b/build-tools/build-wheels/build-wheel-tarball.sh
index 5857e592..27658ef1 100755
--- a/build-tools/build-wheels/build-wheel-tarball.sh
+++ b/build-tools/build-wheels/build-wheel-tarball.sh
@@ -132,7 +132,7 @@ if [ ${VALID_OS} -ne 0 ]; then
 fi
 
 # Build the base wheels and retrieve the StarlingX wheels
-local -a BUILD_BASE_WL_ARGS
+declare -a BUILD_BASE_WL_ARGS
 BUILD_BASE_WL_ARGS+=(--os ${OS} --os-version ${OS_VERSION} --release ${OPENSTACK_RELEASE})
 if [ ! -z "$PROXY" ]; then
     BUILD_BASE_WL_ARGS+=(--proxy ${PROXY})
diff --git a/build-tools/build-wheels/get-stx-wheels.sh b/build-tools/build-wheels/get-stx-wheels.sh
index e24528b8..eb24f09a 100755
--- a/build-tools/build-wheels/get-stx-wheels.sh
+++ b/build-tools/build-wheels/get-stx-wheels.sh
@@ -107,8 +107,8 @@ for wheel in $(sed -e 's/#.*//' ${WHEELS_FILES[@]} | sort -u); do
             # so use grep instead
             wheelfile=$(ls ${MY_WORKSPACE}/std/rpmbuild/RPMS/${wheel}-* | grep -- '[^\-]*-[^\-]*.rpm')
 
-            if [ ! -f ${wheelfile} ]; then
-                echo "Could not find ${wheelfile}" >&2
+            if [ ! -f "${wheelfile}" ]; then
+                echo "Could not find ${wheel}" >&2
                 FAILED+=($wheel)
                 continue
             fi