diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index b4b3c2e0689..348ad9f2674 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -132,8 +132,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
 
     # TODO: fix and enable these warnings - or move to suppression list below
-    add_compile_options_safe(-Wno-documentation-unknown-command) # TODO: Clang currently does not support all commands
-    add_compile_options_safe(-Wno-unused-exception-parameter)
     add_compile_options_safe(-Wno-sign-conversion)
     add_compile_options_safe(-Wno-shadow-field-in-constructor)
     add_compile_options_safe(-Wno-shorten-64-to-32)
diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt
index 9f15c558682..2e1aa036b81 100644
--- a/externals/tinyxml2/CMakeLists.txt
+++ b/externals/tinyxml2/CMakeLists.txt
@@ -15,6 +15,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options_safe(tinyxml2 -Wno-zero-as-null-pointer-constant)
     target_compile_options_safe(tinyxml2 -Wno-format-nonliteral)
     target_compile_options_safe(tinyxml2 -Wno-inconsistent-missing-destructor-override)
+    target_compile_options_safe(tinyxml2 -Wno-sign-conversion)
+    target_compile_options_safe(tinyxml2 -Wno-double-promotion)
 endif()
 if(CYGWIN)
     target_compile_definitions(-D_LARGEFILE_SOURCE)  # required for fseeko() and ftello()
diff --git a/lib/json.h b/lib/json.h
index 2bcfe102071..51101842677 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -28,6 +28,7 @@ SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt")
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
 SUPPRESS_WARNING_CLANG_PUSH("-Wformat")
 SUPPRESS_WARNING_CLANG_PUSH("-Wfloat-conversion")
+SUPPRESS_WARNING_CLANG_PUSH("-Wimplicit-float-conversion")
 
 #define PICOJSON_USE_INT64
 #include <picojson.h> // IWYU pragma: export
@@ -37,6 +38,7 @@ SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_GCC_POP
 SUPPRESS_WARNING_POP