diff --git a/internal/c/parts/audio/out/audio.cpp b/internal/c/parts/audio/out/audio.cpp
index f3a80e09c..6430d70b0 100644
--- a/internal/c/parts/audio/out/audio.cpp
+++ b/internal/c/parts/audio/out/audio.cpp
@@ -69,7 +69,7 @@
 #ifdef QB64_WINDOWS
 #define ZERO_VARIABLE(_v_) ZeroMemory(&(_v_), sizeof(_v_))
 #else
-#define ZERO_VARIABLE(_v_) memset(&(_v_), NULL, sizeof(_v_))
+#define ZERO_VARIABLE(_v_) memset(&(_v_), 0, sizeof(_v_))
 #endif
 //-----------------------------------------------------------------------------------------------------
 
@@ -2119,7 +2119,7 @@ mem_block func__memsound(int32_t handle, int32_t targetChannel)
     AUDIO_DEBUG_PRINT("Data source data pointer = %p", ds->pNode->data.backend.decoded.pData);
 
     // Query the data format
-    if (ma_sound_get_data_format(&audioEngine.soundHandles[handle]->maSound, &maFormat, &channels, NULL, NULL, NULL) != MA_SUCCESS)
+    if (ma_sound_get_data_format(&audioEngine.soundHandles[handle]->maSound, &maFormat, &channels, NULL, NULL, 0) != MA_SUCCESS)
     {
         AUDIO_DEBUG_PRINT("Data format query failed");
         goto error;
diff --git a/internal/c/parts/audio/out/os/osx/build.command b/internal/c/parts/audio/out/os/osx/build.command
index 44e665be9..07c5811ba 100755
--- a/internal/c/parts/audio/out/os/osx/build.command
+++ b/internal/c/parts/audio/out/os/osx/build.command
@@ -26,8 +26,8 @@ clang -c -D LIBXMP_CORE_PLAYER -D LIBXMP_NO_PROWIZARD -D LIBXMP_NO_DEPACKERS -D
 clang -c -D LIBXMP_CORE_PLAYER -D LIBXMP_NO_PROWIZARD -D LIBXMP_NO_DEPACKERS -D BUILDING_STATIC ../../extras/libxmp-lite/smix.c -o temp/smix.o
 clang -c -D LIBXMP_CORE_PLAYER -D LIBXMP_NO_PROWIZARD -D LIBXMP_NO_DEPACKERS -D BUILDING_STATIC ../../extras/libxmp-lite/virtual.c -o temp/virtual.o
 clang -c -D LIBXMP_CORE_PLAYER -D LIBXMP_NO_PROWIZARD -D LIBXMP_NO_DEPACKERS -D BUILDING_STATIC ../../extras/libxmp-lite/xm_load.c -o temp/xm_load.o
-clang++ -c ../../audio.cpp -o temp/audio.o
-clang++ -c ../../miniaudio_impl.cpp -o temp/miniaudio_impl.o
+clang++ -c -std=c++11 ../../audio.cpp -o temp/audio.o
+clang++ -c -std=c++11 ../../miniaudio_impl.cpp -o temp/miniaudio_impl.o
 
 ar rcs src.a temp/common.o temp/control.o temp/dataio.o temp/effects.o temp/filter.o temp/format.o temp/hio.o temp/it_load.o temp/itsex.o temp/lfo.o temp/load.o temp/load_helpers.o temp/md5.o temp/memio.o temp/misc.o temp/mix_all.o temp/mixer.o temp/mod_load.o temp/period.o temp/player.o temp/read_event.o temp/s3m_load.o temp/sample.o temp/scan.o temp/smix.o temp/virtual.o temp/xm_load.o temp/audio.o temp/miniaudio_impl.o