diff --git a/.circleci/config.yml b/.circleci/config.yml
index a54246b5..3124d428 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -470,7 +470,7 @@ jobs:
             name: Install dependencies
             command: |
               curl -fsSL --retry 3 --retry-delay 5 -o /tmp/sdl.zip https://www.libsdl.org/release/SDL2-devel-2.0.5-VC.zip
-              curl -fsSL --retry 3 --retry-delay 5 -o /tmp/openal.zip https://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
+              curl -fsSLk --retry 3 --retry-delay 5 -o /tmp/openal.zip https://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
               curl -fsSL --retry 3 --retry-delay 5 -o /tmp/ffmpeg.zip https://github.com/HaxeFoundation/hashlink/files/5648056/ffmpeg-3.4.2-win64-dev.zip
               cd /tmp
               7z x /tmp/sdl.zip    -oinclude; mv /tmp/include/SDL2*   /tmp/include/sdl
@@ -514,12 +514,12 @@ jobs:
               mkdir ~/deps
               cd ~/deps
               git clone https://github.com/RandomityGuy/hashlink
-              git checkout uwp-compat
               cd hashlink
+              git checkout uwp-compat
               mv /tmp/include/sdl include/sdl
               mv /tmp/include/openal include/openal
-              cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DWITH_SQLITE=OFF -DBUILD_TESTING=OFF -DHASHLINK_INCLUDE_DIR="~/deps/hashlink/src"
-              cmake --build build --config Release -j4
+              "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DUWP=ON -DWITH_SQLITE=OFF -DWITH_VIDEO=OFF -DBUILD_TESTING=OFF -DHASHLINK_INCLUDE_DIR="~/deps/hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+              "/c/Program Files/CMake/bin/cmake" --build build --config Release -j4
 
         - run:
             name: Build datachannel
@@ -527,9 +527,9 @@ jobs:
               mkdir ~/deps
               cd ~/deps
               git clone https://github.com/RandomityGuy/hxDatachannel
-              git checkout uwp-compat
               cd hxDatachannel/cpp
-              "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/build/x64/Release" -DHASHLINK_INCLUDE_DIR="../../hashlink/src"
+              git checkout uwp-compat
+              "/c/Program Files/CMake/bin/cmake" -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHASHLINK_LIBRARY_DIR="~/deps/hashlink/build/bin" -DHASHLINK_INCLUDE_DIR="../../hashlink/src" -DCMAKE_POLICY_VERSION_MINIMUM=3.5
               "/c/Program Files/CMake/bin/cmake" --build build --config Release -j4
               mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.hdll ~/deps/hashlink/build/bin/
               mv ~/deps/hxDatachannel/cpp/build/Release/datachannel.lib ~/deps/hashlink/build/bin/
@@ -560,7 +560,7 @@ jobs:
               cd ~/project
               haxe compile-uwp.hxml
               cd uwp
-              cmake -B build_vs -G "Visual Studio 17 2022" -A x64 -T v142 -DDATACHANNEL_DIR=~/deps/hxDatachannel/cpp/build/Release -DHASHLINK_DIR=~/deps/hashlink/build/bin -DMBHAXE_DIR=../native/x64/Release
+              "/c/Program Files/CMake/bin/cmake" -B build_vs -G "Visual Studio 17 2022" -A x64 -T v142 -DDATACHANNEL_DIR=~/deps/hxDatachannel/cpp/build/Release -DHASHLINK_DIR=~/deps/hashlink/build/bin -DMBHAXE_DIR=../native/x64/Release
               cd native
               HASHLINKPATH=~/deps/hashlink
 
diff --git a/compile-uwp.hxml b/compile-uwp.hxml
index 96747186..4e832327 100644
--- a/compile-uwp.hxml
+++ b/compile-uwp.hxml
@@ -12,4 +12,4 @@ compile-c.hxml
 -cmd sed -i "s/<TargetExt>.exe<\/TargetExt>/<TargetExt>.lib<\/TargetExt>/g" native/marblegame.vcxproj
 
 #-cmd MSBuild.exe -m -nologo -p:Configuration=Debug -p:Platform=x64 -p:PlatformToolset=v142 -v:minimal native/marblegame.sln
--cmd MSBuild.exe -m -nologo -p:Configuration=Release -p:Platform=x64 -p:PlatformToolset=v142 -v:minimal native/marblegame.sln
+#-cmd MSBuild.exe -m -nologo -p:Configuration=Release -p:Platform=x64 -p:PlatformToolset=v142 -v:minimal native/marblegame.sln