diff --git a/.clang-format b/.clang-format
index 5bf32ea4..1d43c4ed 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,5 +3,4 @@ Language: Cpp
 BasedOnStyle: Google
 DerivePointerAlignment: false
 SortIncludes: true
-AllowShortIfStatementsOnASingleLine: true
 ...
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9ddfa5e..1b8fe92f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ function(spvtools_default_compile_options TARGET)
   target_compile_options(${TARGET} PRIVATE ${SPIRV_WARNINGS})
 
   if (${COMPILER_IS_LIKE_GNU})
-    target_compile_options(${TARGET} PRIVATE -std=c++17 -fno-exceptions)
+    target_compile_options(${TARGET} PRIVATE -std=c++11 -fno-exceptions)
     target_compile_options(${TARGET} PRIVATE
       -Wall -Wextra -Wno-long-long -Wshadow -Wundef -Wconversion
       -Wno-sign-conversion)
diff --git a/source/opt/feature_manager.cpp b/source/opt/feature_manager.cpp
index cb1b38f8..a5902716 100644
--- a/source/opt/feature_manager.cpp
+++ b/source/opt/feature_manager.cpp
@@ -52,9 +52,7 @@ void FeatureManager::RemoveExtension(Extension ext) {
 }
 
 void FeatureManager::AddCapability(SpvCapability cap) {
-  if (capabilities_.Contains(cao))
-    // toto
-    return;
+  if (capabilities_.Contains(cap)) return;
 
   capabilities_.Add(cap);