diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025c022..77f51ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,8 @@ if(CMAKE_CROSSCOMPILING)
   add_link_options(-Wl,--gc-sections)
 
   # disable exceptions and related metadata
-  add_compile_options(-fno-exceptions -fno-unwind-tables -fno-rtti)
+  add_compile_options(-fno-exceptions -fno-unwind-tables)
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
   add_link_options(-Wl,--defsym,__exidx_start=0,--defsym,__exidx_end=0)
 else()
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/lib/AddLufa.cmake b/lib/AddLufa.cmake
index 3f0926f..ec381d5 100644
--- a/lib/AddLufa.cmake
+++ b/lib/AddLufa.cmake
@@ -8,4 +8,4 @@ add_library(
   lufa/LUFA/Drivers/USB/Core/Events.c
   )
 
-# target_compile_features(LUFA PUBLIC cxx_std_14)
+target_compile_features(LUFA PUBLIC c_std_11)