diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index a568eb33e6..ae53d4eaa2 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -357,16 +357,16 @@ then
 
     echo "Setting environment variables for Visual Studio..."
     if [ "$OSTYPE" = "cygwin" ] ; then
-        export AUTOBUILD_EXEC="$(cygpath -u $AUTOBUILD)"
+        # load autobuild provided shell functions and variables
+        eval "$("$AUTOBUILD_EXEC" source_environment)"
+        # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake
+        load_vsvars
+    else
+        # load autobuild provided shell functions and variables
+        eval "$("$AUTOBUILD" source_environment)"
+        # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake
+        load_vsvars
     fi
-    if [ -z "$AUTOBUILD_EXEC" ]
-    then
-        export AUTOBUILD_EXEC=`which autobuild`
-    fi
-    # load autobuild provided shell functions and variables
-    eval "$("$AUTOBUILD_EXEC" source_environment)"
-    # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake
-    load_vsvars
 fi
 
 if [ -z "$AUTOBUILD_VARIABLES_FILE" ]
@@ -540,6 +540,8 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         mkdir -p "logs"
     fi
 
+    CMAKE_ARCH=""
+
     if [ $TARGET_PLATFORM == "darwin" ] ; then
         TARGET="Xcode"
     elif [ \( $TARGET_PLATFORM == "linux" \) ] ; then
@@ -556,6 +558,10 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         fi
     elif [ \( $TARGET_PLATFORM == "windows" \) ] ; then
         TARGET="${AUTOBUILD_WIN_CMAKE_GEN}"
+        if [ $AUTOBUILD_ADDRSIZE == 32 ]
+        then
+            CMAKE_ARCH="-A Win32"
+        fi
         UNATTENDED="-DUNATTENDED=ON"
     fi
 
@@ -579,7 +585,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
         fi
     fi
 
-    cmake -G "$TARGET" ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE \
+    cmake -G "$TARGET" $CMAKE_ARCH ../indra $CHANNEL ${GITHASH} $FMODSTUDIO $OPENAL $KDU $OPENSIM $SINGLEGRID $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $TRACY_PROFILER $TESTBUILD $PACKAGE \
           $UNATTENDED -DLL_TESTS:BOOL=OFF -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE $CACHE_OPT \
           $CRASH_REPORTING -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" $LL_ARGS_PASSTHRU ${VSCODE_FLAGS:-} | tee $LOG
 
@@ -601,6 +607,7 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
     elif [ $TARGET_PLATFORM == "linux" ] ; then
         if [ $JOBS == "0" ] ; then
             JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
+            echo $JOBS
         fi
         if [ $WANTS_NINJA -eq $TRUE ] ; then
             ninja -j $JOBS | tee -a $LOG