diff --git a/.github/workflows/build-macos-installer.yml b/.github/workflows/build-macos-installer.yml
index 99bada181891..f8afe833cbbc 100644
--- a/.github/workflows/build-macos-installer.yml
+++ b/.github/workflows/build-macos-installer.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     name: MacOS installer on Catalina and Python 3.8
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       max-parallel: 4
diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml
index e48e4501d912..a19141f8ca2e 100644
--- a/.github/workflows/build-windows-installer.yml
+++ b/.github/workflows/build-windows-installer.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     name: Windows Installer on Windows 10 and Python 3.7
     runs-on: [windows-latest]
-    timeout-minutes: 30
+    timeout-minutes: 40
 
     steps:
     - name: Cancel previous runs on the same branch
diff --git a/build_scripts/installer-version.py b/build_scripts/installer-version.py
index a02bb8064895..ec26d5aeda63 100644
--- a/build_scripts/installer-version.py
+++ b/build_scripts/installer-version.py
@@ -44,6 +44,10 @@ def main():
         patch_release_number = original_minor_ver_list[1]
         if smc_patch_version and "dev" in smc_patch_version:
             dev_release_number = "." + smc_patch_version
+    elif len(version) == 2:
+        major_release_number = scm_major_version
+        minor_release_number = scm_minor_version
+        patch_release_number = "0"
     else:
         major_release_number = scm_major_version
         minor_release_number = scm_minor_version
diff --git a/chia-blockchain-gui b/chia-blockchain-gui
index 4a8e13e4b678..b347e64e4240 160000
--- a/chia-blockchain-gui
+++ b/chia-blockchain-gui
@@ -1 +1 @@
-Subproject commit 4a8e13e4b6789fe92a17a0afd2d3cfdbe2ffde3e
+Subproject commit b347e64e4240c012b090ed0e336854c6c65e55e7