diff --git a/appveyor.yml b/appveyor.yml
index a962c76a5975e10b4757127a877779271a7541c8..cf8587174bf807bc599d798ad038384bea40eb02 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -64,13 +64,11 @@ install:
 - cmd: if [%COMPILER%]==[msvc] (mkdir build)
 - cmd: set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
 - cmd: set PATH=%MINGW_DIR_BIN%;%PATH%
-- cmd: if [%COMPILER%]==[mingw] (cd build-debug & cmake .. -G %GENERATOR% -DCMAKE_INSTALL_PREFIX="..\install" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_INSTALL=ON  -DCMAKE_SH="CMAKE_SH-NOTFOUND" || exit 1 & cd ..)
-- cmd: if [%COMPILER%]==[mingw] (cd build-release & cmake .. -G %GENERATOR% -DCMAKE_INSTALL_PREFIX="..\install" -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_INSTALL=ON  -DCMAKE_SH="CMAKE_SH-NOTFOUND" || exit 1 & cd ..)
+- cmd: if [%COMPILER%]==[mingw] (cd build-debug & cmake .. -G %GENERATOR% -DCMAKE_INSTALL_PREFIX="..\install" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_INSTALL=ON || exit 1 & cd ..)
+- cmd: if [%COMPILER%]==[mingw] (cd build-release & cmake .. -G %GENERATOR% -DCMAKE_INSTALL_PREFIX="..\install" -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_INSTALL=ON || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[msvc] (cd build & cmake .. -G %GENERATOR% -DCMAKE_INSTALL_PREFIX="..\install" -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_INSTALL=ON || exit 1 & cd ..)
 
 build_script:
-- cmd: where sh.exe
-- cmd: set PATH=%PATH:C:\Program Files (x86)\Git\bin;=%
 - cmd: if [%COMPILER%]==[mingw] (cd build-debug & cmake --build . --target install || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[mingw] (cd build-release & cmake --build . --target install || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target INSTALL --config Debug || exit 1 & cd ..)
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 00aa3369739131ffde467a752bfe0b938677aee2..4a22bc67484cac9a752e3eec6f53fb1e7fc3bf44 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -5,7 +5,7 @@ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
 ExternalProject_Add(ZLIB
   DOWNLOAD_COMMAND ""
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/zlib
-  CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+  CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true
   BUILD_COMMAND cmake --build . --target zlibstatic --config MinSizeRel
   INSTALL_COMMAND ""
   TEST_COMMAND ""
@@ -25,7 +25,7 @@ endif()
 ExternalProject_Add(PortAudio
   DOWNLOAD_COMMAND ""
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/libs/portaudio
-  CMAKE_ARGS --DPA_BUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DPA_BUILD_STATIC=ON -DPA_BUILD_TESTS=OFF -DPA_BUILD_EXAMPLES=OFF -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+  CMAKE_ARGS --DPA_BUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true -DPA_BUILD_STATIC=ON -DPA_BUILD_TESTS=OFF -DPA_BUILD_EXAMPLES=OFF
   BUILD_COMMAND cmake --build . --target portaudio_static --config MinSizeRel
   INSTALL_COMMAND ""
   TEST_COMMAND ""
diff --git a/src/rew/decoder-cli/CMakeLists.txt b/src/rew/decoder-cli/CMakeLists.txt
index cb47226cdbb02dbd2724e8bc70538a439d1fb3f1..29e8ecfb4c8731a24e915e27219ff6986ef93135 100644
--- a/src/rew/decoder-cli/CMakeLists.txt
+++ b/src/rew/decoder-cli/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POS
 # Dependencies
 target_include_directories(${PROJECT_NAME} PRIVATE ${ARGAGG_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(${PROJECT_NAME} ${DECODER_PROJECT})
+target_link_libraries(${PROJECT_NAME} ${DECODER_PROJECT} Threads::Threads)
 add_dependencies(${PROJECT_NAME} ${DECODER_PROJECT})
 
 # Add install step
diff --git a/src/rew/decoder/CMakeLists.txt b/src/rew/decoder/CMakeLists.txt
index c6693daf2ce87ae29b0ebc9f360fd01537cb981c..14c917894048bbcd79c23e3ee41a43828123cf62 100644
--- a/src/rew/decoder/CMakeLists.txt
+++ b/src/rew/decoder/CMakeLists.txt
@@ -22,7 +22,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${ASIO_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PORTAUDIO_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
-target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY} Threads::Threads)
 add_dependencies(${PROJECT_NAME} ZLIB PortAudio)
 
 if(WIN32)
diff --git a/src/rew/encoder-cli/CMakeLists.txt b/src/rew/encoder-cli/CMakeLists.txt
index 2c2b8194c3e63eec4987f84cde7b612ff10472b8..e66851556fc45c022bf903176bf1e56155b0a049 100644
--- a/src/rew/encoder-cli/CMakeLists.txt
+++ b/src/rew/encoder-cli/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POS
 # Dependencies
 target_include_directories(${PROJECT_NAME} PRIVATE ${ARGAGG_INCLUDE_DIR} ${DIRENT_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(${PROJECT_NAME} ${ENCODER_PROJECT})
+target_link_libraries(${PROJECT_NAME} ${ENCODER_PROJECT} Threads::Threads)
 add_dependencies(${PROJECT_NAME} ${ENCODER_PROJECT})
 
 # Add install step
diff --git a/src/rew/encoder/CMakeLists.txt b/src/rew/encoder/CMakeLists.txt
index 8d4457284861beb32674eb76488d9a83b0f0e454..16fa9d24a9879f3f66795d267bf096cb1b9ed89b 100644
--- a/src/rew/encoder/CMakeLists.txt
+++ b/src/rew/encoder/CMakeLists.txt
@@ -21,7 +21,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${ZLIB_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PORTAUDIO_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
 
-target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARY} ${PORTAUDIO_LIBRARY} Threads::Threads)
 add_dependencies(${PROJECT_NAME} ZLIB PortAudio)
 
 if(MINGW)