diff --git a/.appveyor.yml b/.appveyor.yml
index 5b29ca6ea2..22ce24b5b0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,7 +5,7 @@ skip_branch_with_pr: true
 only_commits:
   files:
     - .appveyor.yml
-    # The rest of this list should stay in sync with azure-pipelines.yml
+    # The rest of this list should stay in sync with .github/worklows/build_test.yml
     - src/
     - libs/
     - cmake/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65ff1a430b..6af566d9bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,7 @@ set(DEFAULT_NACL_VM_INHERITED_OPTIONS
     BUILD_CGAME
     BUILD_SGAME
     CMAKE_BUILD_TYPE
+    CMAKE_VERBOSE_MAKEFILE
     DAEMON_CBSE_PYTHON_PATH
     USE_ARCH_INTRINSICS
     USE_COMPILER_CUSTOMIZATION
@@ -201,7 +202,7 @@ endmacro()
 set(DEFAULT_USE_EXTERNAL_DEPS_LIBS ON)
 
 if (USE_EXTERNAL_DEPS AND NOT YOKAI_TARGET_SYSTEM_NACL)
-    set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE STRING "Directory in which to store the downloaded dependencies.")
+    set(EXTERNAL_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external_deps" CACHE PATH "Directory in which to store the downloaded dependencies.")
 
     set(DEPS_EXT ".tar.xz")
 
@@ -377,7 +378,7 @@ if (DEPS_DIR)
             endif()
         endif()
 
-        if (cacheVariableValue MATCHES "/(linux|windows|macos)-(i686|amd64)-(default|mingw|msvc)_([0-9]+)/")
+        if (cacheVariableValue MATCHES "/(linux|windows|macos)-(i686|amd64|armhf|arm64)-(default|mingw|msvc)_([0-9]+)/")
             if (NOT ${CMAKE_MATCH_4} EQUAL ${DEPS_VERSION})
                 set(OLD_VERSION ${CMAKE_MATCH_4})
             endif()