diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml
index 9e4c106d2..c9be474f8 100644
--- a/.github/workflows/github.yml
+++ b/.github/workflows/github.yml
@@ -27,12 +27,12 @@ jobs:
             cxx: g++-9
             test: 0
             cmake_args: -G Ninja
-          - platform: mac
-            os: macos-latest
-            test: 0
-            pack: 1
-            extension: dmg
-            cmake_args: -G Ninja
+#          - platform: mac
+#            os: macos-latest
+#            test: 0
+#            pack: 1
+#            extension: dmg
+#            cmake_args: -G Ninja
           - platform: mxe
             os: ubuntu-20.04
             mxe: i686-w64-mingw32.shared
@@ -111,7 +111,8 @@ jobs:
       if: ${{ matrix.pack == 1 }}
       run: |
         cd '${{github.workspace}}/build'
-        cpack -C Release ${{ matrix.cpack_args }}
+        CPACK_PATH=`which -a cpack | grep -m1 -v -i chocolatey`
+        "$CPACK_PATH" -C Release ${{ matrix.cpack_args }}
         
     - name: Additional logs
       if: ${{ failure() && steps.cpack.outcome == 'failure' && matrix.platform == 'mxe' }}
diff --git a/CI/mac/before_install.sh b/CI/mac/before_install.sh
index 438f4da00..aeb7b3b9f 100644
--- a/CI/mac/before_install.sh
+++ b/CI/mac/before_install.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 brew update
+brew pin python@3.9
 brew install smpeg2 libpng freetype qt5 ffmpeg ninja boost tbb luajit
 brew install sdl2 sdl2_ttf sdl2_image sdl2_mixer
 
diff --git a/CI/mxe/before_install.sh b/CI/mxe/before_install.sh
index 63127bbc7..638e18cb6 100644
--- a/CI/mxe/before_install.sh
+++ b/CI/mxe/before_install.sh
@@ -3,8 +3,8 @@
 # Install nsis for installer creation
 sudo apt-get install -qq nsis ninja-build
 
-wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb
-sudo apt install ./libssl1.0.0_1.0.2n-1ubuntu5.6_amd64.deb
+wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.7_amd64.deb
+sudo apt install ./libssl1.0.0_1.0.2n-1ubuntu5.7_amd64.deb
 
 
 # MXE repository was too slow for Travis far too often
diff --git a/scripting/erm/ERMInterpreter.cpp b/scripting/erm/ERMInterpreter.cpp
index b553f9a2b..a29ee54f4 100644
--- a/scripting/erm/ERMInterpreter.cpp
+++ b/scripting/erm/ERMInterpreter.cpp
@@ -988,8 +988,8 @@ namespace ERMConverter
 						fmt % name;
 						fmt % params;
 
-						GenericReceiver receiver(out, fmt.str(), (name == "DO"));
-						bo[0].apply_visitor(receiver);
+						GenericReceiver gr(out, fmt.str(), (name == "DO"));
+						bo[0].apply_visitor(gr);
 					}
 					else
 					{