diff --git a/.clang-format b/.clang-format
index 1d43c4e..5bf32ea 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,4 +3,5 @@
 BasedOnStyle: Google
 DerivePointerAlignment: false
 SortIncludes: true
+AllowShortIfStatementsOnASingleLine: true
 ...
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b8fe92..b9ddfa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@
   target_compile_options(${TARGET} PRIVATE ${SPIRV_WARNINGS})
 
   if (${COMPILER_IS_LIKE_GNU})
-    target_compile_options(${TARGET} PRIVATE -std=c++11 -fno-exceptions)
+    target_compile_options(${TARGET} PRIVATE -std=c++17 -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 a590271..cb1b38f 100644
--- a/source/opt/feature_manager.cpp
+++ b/source/opt/feature_manager.cpp
@@ -52,7 +52,9 @@
 }
 
 void FeatureManager::AddCapability(SpvCapability cap) {
-  if (capabilities_.Contains(cap)) return;
+  if (capabilities_.Contains(cao))
+    // toto
+    return;
 
   capabilities_.Add(cap);