diff --git a/.gitmodules b/.gitmodules
index c452973f..37f5799e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/gabomdq/SDL_GameControllerDB.git
 [submodule "soundio/libsoundio"]
 	path = soundio/libsoundio
-	url = https://github.com/andrewrk/libsoundio.git
+	url = https://github.com/cgutman/libsoundio.git
 [submodule "h264bitstream/h264bitstream"]
 	path = h264bitstream/h264bitstream
 	url = https://github.com/aizvorski/h264bitstream.git
diff --git a/app/main.cpp b/app/main.cpp
index 892808b2..2befdd3d 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -23,7 +23,7 @@
 #include "streaming/video/ffmpeg.h"
 #endif
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) && defined(Q_PROCESSOR_X86)
 #include "antihookingprotection.h"
 #elif defined(Q_OS_LINUX)
 #include <openssl/ssl.h>
diff --git a/app/streaming/audio/renderers/sdlaud.cpp b/app/streaming/audio/renderers/sdlaud.cpp
index b39fe350..a279665d 100644
--- a/app/streaming/audio/renderers/sdlaud.cpp
+++ b/app/streaming/audio/renderers/sdlaud.cpp
@@ -42,7 +42,7 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
         return false;
     }
 
-    m_AudioBuffer = malloc(m_FrameSize);
+    m_AudioBuffer = SDL_malloc(m_FrameSize);
     if (m_AudioBuffer == nullptr) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to allocate audio buffer");
@@ -74,7 +74,7 @@ SdlAudioRenderer::~SdlAudioRenderer()
     }
 
     if (m_AudioBuffer != nullptr) {
-        free(m_AudioBuffer);
+        SDL_free(m_AudioBuffer);
     }
 
     SDL_QuitSubSystem(SDL_INIT_AUDIO);
diff --git a/soundio/libsoundio b/soundio/libsoundio
index fb23636c..b9160c57 160000
--- a/soundio/libsoundio
+++ b/soundio/libsoundio
@@ -1 +1 @@
-Subproject commit fb23636c95e4a86526bedc903ae9e79f94936d74
+Subproject commit b9160c575d13c33298e3c6a8c1302b20b6a40412
diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index db9325a4..1d648e7f 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -35,7 +35,7 @@
       <![CDATA[Installed OR MPSSVC_START="#2"]]>
     </Condition>
 
-    <?if $(var.Platform) = x64 ?>
+    <?if $(var.Platform) = x64 Or $(var.Platform) = arm64 ?>
       <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
     <?else ?>
       <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>