diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84cafb0f7b1974ad8b3250ac650bfaa7869b48ec..3df4bd1c2a518300be350869b5b297e1a6148e8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,13 +19,13 @@ build:
     expire_in: 1 week
     paths:
     - doc/doxygen/
-    - build/WineGUI-*.deb
-    - build/WineGUI-*.rpm
-    - build/WineGUI-*.tar.gz
+    - build_prod/WineGUI-*.deb
+    - build_prod/WineGUI-*.rpm
+    - build_prod/WineGUI-*.tar.gz
   cache:
       key: "$CI_PIPELINE_ID"
       paths:
-        - build/bin
+        - build_prod/bin
       policy: push
 
 publish:
@@ -37,23 +37,23 @@ publish:
   except:
     - branches
   script:
-    - export APP_VERSION=`./build/bin/winegui --version`
+    - export APP_VERSION=`./build_prod/bin/winegui --version`
     - echo $APP_VERSION
     - ./release.sh
     - ./create_release_links.sh
   cache:
       key: "$CI_PIPELINE_ID"
       paths:
-        - build/bin
+        - build_prod/bin
       policy: pull
 
 #unit_test:
 #  stage: test
-#  script: ./build/bin/runTests
+#  script: ./build_prod/bin/runTests
 #  tags:
 #    - gtk
 #  cache:
 #      key: "$CI_PIPELINE_ID"
 #      policy: pull
 #      paths:
-#        - build/bin/
+#        - build_prod/bin/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df52b63f437e55e65b589995dc88d85798eaa06..f72ce6037c39bdf08034da3218950d060bf23851 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 2.8.0)
 # Cmake settings
 set(CMAKE_CXX_FLAGS "-Wall -Wextra")
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(NOT CYGWIN)
diff --git a/build_prod.sh b/build_prod.sh
index e8d0e6aed995a8dba5bdf9fc59cf3af6c4a71ac2..5a668cc008b11518f8495cd65b04c2b4352db4a4 100755
--- a/build_prod.sh
+++ b/build_prod.sh
@@ -2,19 +2,10 @@
 # By: Melroy van den Berg
 # Description: Release production build + create Debian package file (.deb), 
 #   RPM [Red Hat] Package Manager (.rpm) and compressed file (.tgz/.tar.gz)
-
-if [ ! -d "build" ]; then
-  echo "Creating build directory..."
-  mkdir build
-fi
-
-if [ -z "$(ls build)" ]; then
-  cd build
-  cmake -GNinja -Ddoc=ON -DCMAKE_BUILD_TYPE=Release ..
-else
-  echo "INFO: Only run ninja..."
-  cd build
-fi
+rm -rf build_prod
+mkdir build_prod
+cd build_prod
+cmake -GNinja -Ddoc=ON -DCMAKE_BUILD_TYPE=Release ..
 ninja && 
 echo "INFO: Building packages...";
 cpack -G "TGZ;DEB;RPM"
diff --git a/include/bottle_types.h b/include/bottle_types.h
index 121ecc539240de79638516b4b276b1aaf495f36a..9202b5c7a8acf550a8eabcc67dc20a31c4fb8251 100644
--- a/include/bottle_types.h
+++ b/include/bottle_types.h
@@ -93,6 +93,7 @@ namespace BottleTypes {
     std::pair(Windows::Windows2003, Bit::win64),
     std::pair(Windows::WindowsVista, Bit::win32),
     std::pair(Windows::WindowsVista, Bit::win64),
+    std::pair(Windows::Windows2008, Bit::win32),
     std::pair(Windows::Windows2008, Bit::win64),
     std::pair(Windows::Windows7, Bit::win32),
     std::pair(Windows::Windows7, Bit::win64),
@@ -219,10 +220,12 @@ namespace BottleTypes {
         return "vista";
       case Windows::Windows2008:
         return "win2k8"; // Not yet implemented by Winetricks? Use 2008R2 atm (should be 'win2k8' eventually)
+        // TODO: Fix after PR is merged into master: https://github.com/Winetricks/winetricks/pull/1488
       case Windows::Windows7:
         return "win7";
       case Windows::Windows2008R2:
         return "win2k8"; // Bug in Winetricks, should be 'win2k8r2' to be unique with Windows 2000!
+        // TODO: Fix after PR is merged into master: https://github.com/Winetricks/winetricks/pull/1488
       case Windows::Windows8:
         return "win8";
       case Windows::Windows81:
@@ -242,7 +245,7 @@ namespace BottleTypes {
       case AudioDriver::alsa:
         return "Advanced Linux Sound Architecture (ALSA)";
       case AudioDriver::coreaudio:
-        return "Core Audio";
+        return "Mac Core Audio";
       case AudioDriver::oss:
         return "Open Sound System (OSS)";
       default:
diff --git a/release.sh b/release.sh
index 4e366b6c6e869f0ec4174d1b7f81fc44a4aa1120..2ede7e69dcb1cd2076a33f0313ca55b29a2a284c 100755
--- a/release.sh
+++ b/release.sh
@@ -16,5 +16,5 @@ if [[ "$output" == *"$name"* ]]; then
     echo "INFO: Release is already rolled-out to the downloads folder."
 else
     # Roll-out the new release
-    sshpass -e scp -o stricthostkeychecking=no ./build/WineGUI-v* melroy@server.melroy.org:/var/www/winegui.melroy.org/html/downloads
+    sshpass -e scp -o stricthostkeychecking=no ./build_prod/WineGUI-v* melroy@server.melroy.org:/var/www/winegui.melroy.org/html/downloads
 fi