diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9da843cd..2b1944d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB_RECURSE INC_FILES ../include/*.hpp)
 file(GLOB_RECURSE SRC_FILES *.cpp)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-	add_definitions(
+	add_compile_options(
 		-fno-exceptions
 		-pedantic
 		-Wall
@@ -31,12 +31,17 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU)")
-	add_definitions(
+	add_compile_options(
 		-Wlogical-op
 		-Wnoexcept
 		-Wstrict-null-sentinel
 	)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	add_compile_options(
+		-Wc++11-compat
+	)
+endif()
 
 add_library(ArduinoJson ${SRC_FILES} ${INC_FILES})
\ No newline at end of file
diff --git a/src/Internals/List.cpp b/src/Internals/List.cpp
index 0b6af23a..f8d721da 100644
--- a/src/Internals/List.cpp
+++ b/src/Internals/List.cpp
@@ -31,5 +31,5 @@ void List<T>::removeNode(node_type *nodeToRemove) {
   }
 }
 
-template class List<JsonPair>;
-template class List<JsonVariant>;
+template class ArduinoJson::Internals::List<JsonPair>;
+template class ArduinoJson::Internals::List<JsonVariant>;