diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 03446b6..30b7f06 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -25,10 +25,9 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
diff --git a/appveyor.yml b/appveyor.yml
index 235e03b..794e21a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -127,16 +127,20 @@ environment:
 
 install:
   - sh: |
+      if [ "$COMPILER_ID" = "clang" ]
+      then
+        brew install jpeg giflib libtiff libogg libvorbis libsndfile zlib
+      else
+        sudo apt-get -y update
+        sudo apt-get -y install libpng-dev libjpeg-dev libgif-dev libtiff-dev libogg-dev libvorbis-dev libsndfile-dev zlib1g-dev
+      fi
       cd $APPVEYOR_BUILD_FOLDER
-      if [ "$COMPILER_ID" != "clang" ]; then sudo apt-get -y update; fi
-      if [ "$COMPILER_ID" != "clang" ]; then sudo apt-get -y install gcc-multilib g++-multilib libpng-dev libjpeg-dev libgif-dev libtiff-dev libogg-dev libvorbis-dev libsndfile-dev zlib1g-dev; fi
-      if [ "$COMPILER_ID" = "clang" ]; then brew install jpeg giflib libtiff libogg libvorbis libsndfile zlib; fi
   - cmd: |
-      cd %APPVEYOR_BUILD_FOLDER%
       set PATH=%APPVEYOR_BUILD_FOLDER%\downloads\doxygen-1.8.14;%PATH%
       if "%CMAKE_GENERATOR%" == "MSYS Makefiles" set PATH=C:\msys64\%COMPILER_ID%\bin;C:\msys64\usr\bin\;%PATH%
       if "%CMAKE_GENERATOR%" == "MSYS Makefiles" pacman --noconfirm -Syu
       if "%CMAKE_GENERATOR%" == "MSYS Makefiles" pacman --noconfirm -S mingw-w64-%CMAKE_PLATFORM%-zlib mingw-w64-%CMAKE_PLATFORM%-giflib mingw-w64-%CMAKE_PLATFORM%-libjpeg-turbo mingw-w64-%CMAKE_PLATFORM%-jasper mingw-w64-%CMAKE_PLATFORM%-libtiff mingw-w64-%CMAKE_PLATFORM%-libogg mingw-w64-%CMAKE_PLATFORM%-libvorbis mingw-w64-%CMAKE_PLATFORM%-libsndfile
+      cd %APPVEYOR_BUILD_FOLDER%
   - git submodule update --init --recursive
 
 # Assumes that we use the vx.y.z tagging scheme (e.g. v1.3.0)