diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh
index 3303080fb..ce93f76b3 100755
--- a/data/windows/build-win32.sh
+++ b/data/windows/build-win32.sh
@@ -10,7 +10,7 @@ set -e
 MINGW=i686-w64-mingw32
 MINGW_PATH=/opt/mingw32
 
-JOBS="-j 2"
+JOBS="-j 8"
 
 if [ ! -f Makefile ]; then
   cd ../..
@@ -49,16 +49,20 @@ rm -f ./source/Carla.pyw
 
 cd data/windows/
 
+rm -rf dist
+$CXFREEZE ../../bin/resources/bigmeter-ui
+$CXFREEZE ../../bin/resources/carla-plugin
+$CXFREEZE ../../bin/resources/carla-plugin-patchbay
+$CXFREEZE ../../bin/resources/midipattern-ui
+$CXFREEZE ../../bin/resources/notes-ui
+
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
 rm Carla/carla-discovery-native.exe
 rm Carla/carla-lv2-export.exe
 
-# FIXME
-rm Carla/carla-bridge-lv2-windows.exe
-rm Carla/carla-bridge-native.exe
-
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd Carla/PyQt5.QtXml.pyd
+rm -f dist/PyQt5.Qsci.pyd dist/PyQt5.QtNetwork.pyd dist/PyQt5.QtSql.pyd dist/PyQt5.QtTest.pyd dist/PyQt5.QtXml.pyd
 
 cp $WINEPREFIX/drive_c/Python34/python34.dll                                Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll            Carla/
@@ -68,9 +72,19 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll         Carl
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Gui.dll          Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Widgets.dll      Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5OpenGL.dll       Carla/
-cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5PrintSupport.dll Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carla/
 
+mv dist Carla/resources
+cp $WINEPREFIX/drive_c/Python34/python34.dll                                Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll            Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libEGL.dll          Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libGLESv2.dll       Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll         Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Gui.dll          Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Widgets.dll      Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5OpenGL.dll       Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carla/resources/
+
 # Build unzipfx
 make -C unzipfx-carla -f Makefile.win32 clean
 make -C unzipfx-carla -f Makefile.win32
@@ -88,12 +102,12 @@ chmod +x Carla.exe
 rm -f Carla.zip CarlaControl.zip
 
 # Create release zip
-rm -rf Carla-2.0beta4-win32
-mkdir Carla-2.0beta4-win32
-mkdir Carla-2.0beta4-win32/vcredist
-cp Carla.exe README.txt Carla-2.0beta4-win32
-cp ~/.cache/winetricks/vcrun2010/vcredist_x86.exe Carla-2.0beta4-win32/vcredist
-zip -r -9 Carla-2.0beta4-win32.zip Carla-2.0beta4-win32
+rm -rf Carla-2.0beta5-win32
+mkdir Carla-2.0beta5-win32
+mkdir Carla-2.0beta5-win32/vcredist
+cp Carla.exe README.txt Carla-2.0beta5-win32
+cp ~/.cache/winetricks/vcrun2010/vcredist_x86.exe Carla-2.0beta5-win32/vcredist
+zip -r -9 Carla-2.0beta5-win32.zip Carla-2.0beta5-win32
 
 cd ../..
 
diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh
index 2755b4af3..be53b0123 100755
--- a/data/windows/build-win64.sh
+++ b/data/windows/build-win64.sh
@@ -10,7 +10,7 @@ set -e
 MINGW=x86_64-w64-mingw32
 MINGW_PATH=/opt/mingw64
 
-JOBS="-j 2"
+JOBS="-j 8"
 
 if [ ! -f Makefile ]; then
   cd ../..
@@ -51,16 +51,20 @@ rm -f ./source/Carla.pyw
 
 cd data/windows/
 
+rm -rf dist
+$CXFREEZE ../../bin/resources/bigmeter-ui
+$CXFREEZE ../../bin/resources/carla-plugin
+$CXFREEZE ../../bin/resources/carla-plugin-patchbay
+$CXFREEZE ../../bin/resources/midipattern-ui
+$CXFREEZE ../../bin/resources/notes-ui
+
 cp ../../bin/*.dll Carla/
 cp ../../bin/*.exe Carla/
 rm Carla/carla-discovery-native.exe
 rm Carla/carla-lv2-export.exe
 
-# FIXME
-rm Carla/carla-bridge-lv2-windows.exe
-rm Carla/carla-bridge-native.exe
-
 rm -f Carla/PyQt5.Qsci.pyd Carla/PyQt5.QtNetwork.pyd Carla/PyQt5.QtSql.pyd Carla/PyQt5.QtTest.pyd Carla/PyQt5.QtXml.pyd
+rm -f dist/PyQt5.Qsci.pyd dist/PyQt5.QtNetwork.pyd dist/PyQt5.QtSql.pyd dist/PyQt5.QtTest.pyd dist/PyQt5.QtXml.pyd
 
 cp $WINEPREFIX/drive_c/Python34/python34.dll                                Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll            Carla/
@@ -70,9 +74,19 @@ cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll         Carl
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Gui.dll          Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Widgets.dll      Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5OpenGL.dll       Carla/
-cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5PrintSupport.dll Carla/
 cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carla/
 
+mv dist Carla/resources
+cp $WINEPREFIX/drive_c/Python34/python34.dll                                Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/icu*.dll            Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libEGL.dll          Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/libGLESv2.dll       Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Core.dll         Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Gui.dll          Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Widgets.dll      Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5OpenGL.dll       Carla/resources/
+cp $WINEPREFIX/drive_c/Python34/Lib/site-packages/PyQt5/Qt5Svg.dll          Carla/resources/
+
 # Build unzipfx
 make -C unzipfx-carla -f Makefile.win32 clean
 make -C unzipfx-carla -f Makefile.win32
@@ -90,12 +104,12 @@ chmod +x Carla.exe
 rm -f Carla.zip CarlaControl.zip
 
 # Create release zip
-rm -rf Carla-2.0beta4-win64
-mkdir Carla-2.0beta4-win64
-mkdir Carla-2.0beta4-win64/vcredist
-cp Carla.exe README.txt Carla-2.0beta4-win64
-cp ~/.cache/winetricks/vcrun2010/vcredist_x64.exe Carla-2.0beta4-win64/vcredist
-zip -r -9 Carla-2.0beta4-win64.zip Carla-2.0beta4-win64
+rm -rf Carla-2.0beta5-win64
+mkdir Carla-2.0beta5-win64
+mkdir Carla-2.0beta5-win64/vcredist
+cp Carla.exe README.txt Carla-2.0beta5-win64
+cp ~/.cache/winetricks/vcrun2010/vcredist_x64.exe Carla-2.0beta5-win64/vcredist
+zip -r -9 Carla-2.0beta5-win64.zip Carla-2.0beta5-win64
 
 cd ../..
 
diff --git a/source/native-plugins/zynaddsubfx/Misc/BankDb.cpp b/source/native-plugins/zynaddsubfx/Misc/BankDb.cpp
index a92bc111d..7d7b74819 100644
--- a/source/native-plugins/zynaddsubfx/Misc/BankDb.cpp
+++ b/source/native-plugins/zynaddsubfx/Misc/BankDb.cpp
@@ -227,12 +227,16 @@ BankEntry BankDb::processXiz(std::string filename,
 {
     string fname = bank+filename;
 
+#ifdef WIN32
+    int ret, time = 0;
+#else
     //Grab a timestamp
     struct stat st;
     int ret  = lstat(fname.c_str(), &st);
     int time = 0;
     if(ret != -1)
         time = st.st_mtim.tv_sec;
+#endif
 
     //quickly check if the file exists in the cache and if it is up-to-date
     if(cache.find(fname) != cache.end() &&