diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ee8df8..528c1e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,14 @@ project(NAM VERSION 0.3.0)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED OFF)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++20")
+
+# Use libc++ on macOS, system default on Linux
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 	include_directories(SYSTEM /usr/local/include)
diff --git a/NAM/dsp.cpp b/NAM/dsp.cpp
index b297b09..ec5892b 100644
--- a/NAM/dsp.cpp
+++ b/NAM/dsp.cpp
@@ -1,5 +1,4 @@
 #include <algorithm> // std::max_element
-#include <algorithm>
 #include <cmath> // pow, tanh, expf
 #include <filesystem>
 #include <fstream>
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 3174c3e..ee71722 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,5 +1,6 @@
 file(GLOB_RECURSE NAM_SOURCES ../NAM/*.cpp ../NAM/*.c ../NAM*.h)
 
+# TODO: add loadmodel and run_tests to TOOLS?
 set(TOOLS benchmodel)
 
 add_custom_target(tools ALL