diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh
index 7e9bf801d..54dbb8c59 100755
--- a/data/windows/build-win32.sh
+++ b/data/windows/build-win32.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 MINGW=i686-w64-mingw32
 MINGW_PATH=/opt/mingw32
 
@@ -51,7 +53,9 @@ make $JOBS -C source/backend/standalone ../libcarla_standalone.dll CARLA_RTAUDIO
   DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN=""
 
 rm -rf ./data/windows/Carla
-$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.py"
+cp ./source/carla.py ./source/carla.pyw
+$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
+rm -f ./source/carla.pyw
 
 cd data/windows
 mkdir Carla/backend
@@ -76,13 +80,15 @@ make -C unzipfx-carla -f Makefile.win32
 
 # Create static build
 rm -f Carla.zip
-zip -r Carla.zip Carla
+zip -r -9 Carla.zip Carla
 
 rm -f Carla.exe
 cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
 chmod +x Carla.exe
 
+# Cleanup
 make -C unzipfx-carla -f Makefile.win32 clean
+rm -f Carla.zip
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3"
diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh
index 79e9f116d..79982cc41 100755
--- a/data/windows/build-win64.sh
+++ b/data/windows/build-win64.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 MINGW=x86_64-w64-mingw32
 MINGW_PATH=/opt/mingw64
 
@@ -51,7 +53,9 @@ make $JOBS -C source/backend/standalone ../libcarla_standalone.dll CARLA_RTAUDIO
   DGL_LIBS="" EXTRA_LIBS="$EXTRA_LIBS $EXTRA_LIBS2" OBJSN=""
 
 rm -rf ./data/windows/Carla
-$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.py"
+cp ./source/carla.py ./source/carla.pyw
+$CXFREEZE --target-dir=".\\data\\windows\\Carla" ".\\source\\carla.pyw"
+rm -f ./source/carla.pyw
 
 cd data/windows
 mkdir Carla/backend
@@ -76,13 +80,15 @@ make -C unzipfx-carla -f Makefile.win32
 
 # Create static build
 rm -f Carla.zip
-zip -r Carla.zip Carla
+zip -r -9 Carla.zip Carla
 
 rm -f Carla.exe
 cat unzipfx-carla/unzipfx2cat.exe Carla.zip > Carla.exe
 chmod +x Carla.exe
 
+# Cleanup
 make -C unzipfx-carla -f Makefile.win32 clean
+rm -f Carla.zip
 
 # Testing:
 echo "export WINEPREFIX=~/.winepy3_x64"
diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp
index 593c165cf..a47c1df99 100644
--- a/source/backend/standalone/CarlaStandalone.cpp
+++ b/source/backend/standalone/CarlaStandalone.cpp
@@ -80,6 +80,7 @@ struct CarlaBackendStandalone {
         app->quit();
         app->processEvents();
         delete app;
+        app = nullptr;
     }
 
 } standalone;
diff --git a/source/carla.py b/source/carla.py
index 388977b04..b81567770 100755
--- a/source/carla.py
+++ b/source/carla.py
@@ -739,7 +739,12 @@ class CarlaMainW(QMainWindow):
 
         settings = QSettings()
 
-        Carla.processMode    = settings.value("Engine/ProcessMode", PROCESS_MODE_MULTIPLE_CLIENTS, type=int)
+        if LINUX:
+            defaultMode = PROCESS_MODE_MULTIPLE_CLIENTS
+        else:
+            defaultMode = PROCESS_MODE_CONTINUOUS_RACK
+
+        Carla.processMode    = settings.value("Engine/ProcessMode", defaultMode, type=int)
         Carla.maxParameters  = settings.value("Engine/MaxParameters", MAX_DEFAULT_PARAMETERS, type=int)
 
         transportMode        = settings.value("Engine/TransportMode", TRANSPORT_MODE_JACK, type=int)