diff --git a/src/AudioTools/AudioCodecs/CodecMTS.h b/src/AudioTools/AudioCodecs/CodecMTS.h
index d572d342da..a857629274 100644
--- a/src/AudioTools/AudioCodecs/CodecMTS.h
+++ b/src/AudioTools/AudioCodecs/CodecMTS.h
@@ -364,7 +364,7 @@ class MTSDecoder : public AudioDecoder {
       int elementaryPID =
           ((pmt[cursor + 1] & 0x1F) << 8) | (pmt[cursor + 2] & 0xFF);
       LOGI("-- Stream Type: 0x%02X(%d) [%s] for Elementary PID: 0x%04X(%d)",
-           streamType, streamType, toStr(streamType), elementaryPID,
+           (int)streamType, (int)streamType, toStr(streamType), elementaryPID,
            elementaryPID);
 
       if (isStreamTypeActive(streamType)) {
diff --git a/src/AudioTools/CoreAudio/AudioStreams.h b/src/AudioTools/CoreAudio/AudioStreams.h
index 7e0c529854..57917ce7a0 100644
--- a/src/AudioTools/CoreAudio/AudioStreams.h
+++ b/src/AudioTools/CoreAudio/AudioStreams.h
@@ -1331,8 +1331,7 @@ class InputMerge : public AudioStream {
 
   /// Adds a new input stream with 1 channel
   void add(Stream &in, int channelCount, float weight = 1.0) {
-    MergeRecord rec(in, channelCount, weight);
-    ;
+    MergeRecord rec(&in, channelCount, weight);
     records.push_back(rec);
     total_channel_count += channelCount;
   }
@@ -1370,6 +1369,7 @@ class InputMerge : public AudioStream {
     Stream *stream = nullptr;
     int channels = 0;
     float weight = 1.0;
+    MergeRecord() = default;
     MergeRecord(Stream *str, int ch, float w) {
       stream = str;
       channels = ch;
diff --git a/tests-cmake/CMakeLists.txt b/tests-cmake/CMakeLists.txt
index b238203987..8f494359e1 100644
--- a/tests-cmake/CMakeLists.txt
+++ b/tests-cmake/CMakeLists.txt
@@ -7,10 +7,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
 project(tests)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror" )
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)
 
diff --git a/tests-cmake/codec/CMakeLists.txt b/tests-cmake/codec/CMakeLists.txt
index a833d3017f..7e44e3f15e 100644
--- a/tests-cmake/codec/CMakeLists.txt
+++ b/tests-cmake/codec/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(tests-codec)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror" )
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 
 include(FetchContent)
diff --git a/tests-cmake/codec/aac-faad/CMakeLists.txt b/tests-cmake/codec/aac-faad/CMakeLists.txt
index f9b44ce900..50a3db1146 100644
--- a/tests-cmake/codec/aac-faad/CMakeLists.txt
+++ b/tests-cmake/codec/aac-faad/CMakeLists.txt
@@ -3,11 +3,9 @@ cmake_minimum_required(VERSION 2.34)
 # set the project name
 project(aac-faad)
 set (CMAKE_CXX_STANDARD 11)
-set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+set (DCMAKE_CXX_FLAGS -Werror )
+# add_compile_options(-Wstack-usage=1024)
+
 include(FetchContent)
 
 # Build with arduino-audio-tools
@@ -27,11 +25,11 @@ endif()
 add_executable (aac-faad aac-faad.cpp)
 
 # set preprocessor defines
-target_compile_definitions(aac-faad PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP -DANALYSIS)
+target_compile_definitions(aac-faad PUBLIC -DARDUINO  -DIS_DESKTOP -DANALYSIS)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)
 
 # specify libraries
-target_link_libraries(aac-faad portaudio arduino_emulator libfaad arduino-audio-tools)
+target_link_libraries(aac-faad arduino_emulator libfaad arduino-audio-tools)
 
diff --git a/tests-cmake/codec/aac-faad/aac-faad.cpp b/tests-cmake/codec/aac-faad/aac-faad.cpp
index 215297e024..e2882f1472 100644
--- a/tests-cmake/codec/aac-faad/aac-faad.cpp
+++ b/tests-cmake/codec/aac-faad/aac-faad.cpp
@@ -1,7 +1,7 @@
 #include "Arduino.h"
 #include "AudioTools.h"
 #include "AudioTools/AudioCodecs/CodecAACFAAD.h"
-#include "AudioTools/AudioLibs/PortAudioStream.h"
+//#include "AudioTools/AudioLibs/PortAudioStream.h"
 #include "audio.h"
 
 using namespace audio_tools;  
diff --git a/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt b/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt
index 23aebf4bab..3c7d16cfc0 100644
--- a/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt
+++ b/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(aac-fdk-encode)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)
 
diff --git a/tests-cmake/codec/aac-fdk/CMakeLists.txt b/tests-cmake/codec/aac-fdk/CMakeLists.txt
index bb3acbf2eb..4d752834fa 100644
--- a/tests-cmake/codec/aac-fdk/CMakeLists.txt
+++ b/tests-cmake/codec/aac-fdk/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(aac-fdk)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 include(FetchContent)
 
 # Build with arduino-audio-tools
diff --git a/tests-cmake/codec/aac-helix/CMakeLists.txt b/tests-cmake/codec/aac-helix/CMakeLists.txt
index 200d2b8068..e20e40aff6 100644
--- a/tests-cmake/codec/aac-helix/CMakeLists.txt
+++ b/tests-cmake/codec/aac-helix/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(aac-helix)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 include(FetchContent)
 
 # Build with arduino-audio-tools
diff --git a/tests-cmake/codec/container-avi-movie/CMakeLists.txt b/tests-cmake/codec/container-avi-movie/CMakeLists.txt
index 92c994843b..53755c56d9 100644
--- a/tests-cmake/codec/container-avi-movie/CMakeLists.txt
+++ b/tests-cmake/codec/container-avi-movie/CMakeLists.txt
@@ -5,10 +5,7 @@ project(container-avi-movie)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 include(FetchContent)
 
 # Add Portaduio for desktop build
diff --git a/tests-cmake/codec/container-avi/CMakeLists.txt b/tests-cmake/codec/container-avi/CMakeLists.txt
index fd92f9419d..5733b73133 100644
--- a/tests-cmake/codec/container-avi/CMakeLists.txt
+++ b/tests-cmake/codec/container-avi/CMakeLists.txt
@@ -5,10 +5,7 @@ project(container-avi)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)
 
diff --git a/tests-cmake/codec/container-binary/CMakeLists.txt b/tests-cmake/codec/container-binary/CMakeLists.txt
index c1f3826083..d09abbd10c 100644
--- a/tests-cmake/codec/container-binary/CMakeLists.txt
+++ b/tests-cmake/codec/container-binary/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(container-binary)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 include(FetchContent)
 
 # Build with arduino-audio-tools
diff --git a/tests-cmake/codec/container-m4a/CMakeLists.txt b/tests-cmake/codec/container-m4a/CMakeLists.txt
index 071beec6b2..97964eaa3e 100644
--- a/tests-cmake/codec/container-m4a/CMakeLists.txt
+++ b/tests-cmake/codec/container-m4a/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(container-m4a)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 include(FetchContent)
 
 # Build with arduino-audio-tools
diff --git a/tests-cmake/codec/mp3-helix/CMakeLists.txt b/tests-cmake/codec/mp3-helix/CMakeLists.txt
index e44ef3682d..4a6c8c6b8f 100644
--- a/tests-cmake/codec/mp3-helix/CMakeLists.txt
+++ b/tests-cmake/codec/mp3-helix/CMakeLists.txt
@@ -5,10 +5,7 @@ project(mp3-helix)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)
 
diff --git a/tests-cmake/codec/mp3-metadata/CMakeLists.txt b/tests-cmake/codec/mp3-metadata/CMakeLists.txt
index 0cc54ac61c..7cff3ef5b1 100644
--- a/tests-cmake/codec/mp3-metadata/CMakeLists.txt
+++ b/tests-cmake/codec/mp3-metadata/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(mp3-metadata)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Build with arduino-audio-tools
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
diff --git a/tests-cmake/codec/wav/CMakeLists.txt b/tests-cmake/codec/wav/CMakeLists.txt
index 511d54ff0e..3c8c5f93ed 100644
--- a/tests-cmake/codec/wav/CMakeLists.txt
+++ b/tests-cmake/codec/wav/CMakeLists.txt
@@ -5,10 +5,7 @@ project(wav-test)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)
 
diff --git a/tests-cmake/effects/CMakeLists.txt b/tests-cmake/effects/CMakeLists.txt
index 45921c8144..3545f677a2 100644
--- a/tests-cmake/effects/CMakeLists.txt
+++ b/tests-cmake/effects/CMakeLists.txt
@@ -5,10 +5,7 @@ project(effects)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Add Portaduio for desktop build
 add_compile_options(-DIS_DESKTOP)
diff --git a/tests-cmake/filter-wav/CMakeLists.txt b/tests-cmake/filter-wav/CMakeLists.txt
index 458498691f..09cc09f4da 100644
--- a/tests-cmake/filter-wav/CMakeLists.txt
+++ b/tests-cmake/filter-wav/CMakeLists.txt
@@ -5,10 +5,7 @@ project(filter-wav)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Add Portaduio for desktop build
 add_compile_options(-DIS_DESKTOP)
diff --git a/tests-cmake/filter/CMakeLists.txt b/tests-cmake/filter/CMakeLists.txt
index 32b70dd81b..1ee15459b8 100644
--- a/tests-cmake/filter/CMakeLists.txt
+++ b/tests-cmake/filter/CMakeLists.txt
@@ -5,10 +5,7 @@ project(filter)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Add Portaduio for desktop build
 add_compile_options(-DIS_DESKTOP)
diff --git a/tests-cmake/player-wav/CMakeLists.txt b/tests-cmake/player-wav/CMakeLists.txt
index 5d6a7f317a..136856b38e 100644
--- a/tests-cmake/player-wav/CMakeLists.txt
+++ b/tests-cmake/player-wav/CMakeLists.txt
@@ -5,10 +5,7 @@ project(player-wav)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Add Portaduio for desktop build
 add_compile_options(-DIS_DESKTOP)
diff --git a/tests-cmake/resample/CMakeLists.txt b/tests-cmake/resample/CMakeLists.txt
index 00420b7aff..fcf35f8e62 100644
--- a/tests-cmake/resample/CMakeLists.txt
+++ b/tests-cmake/resample/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(resample)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 # Build with arduino-audio-tools
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
diff --git a/tests-cmake/url-test/CMakeLists.txt b/tests-cmake/url-test/CMakeLists.txt
index 1e56fcb873..7fdfa72028 100644
--- a/tests-cmake/url-test/CMakeLists.txt
+++ b/tests-cmake/url-test/CMakeLists.txt
@@ -4,10 +4,7 @@ cmake_minimum_required(VERSION 3.20)
 project(url-test)
 set (CMAKE_CXX_STANDARD 11)
 set (DCMAKE_CXX_FLAGS "-Werror")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-    set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
-endif()
+# add_compile_options(-Wstack-usage=1024)
 
 include(FetchContent)