diff --git a/.travis.yml b/.travis.yml
index 1e1a0e362..7dc694cfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,7 +82,6 @@ addons:
     #   secure: "Qkmp4VrQJtKgZ/pz65SNnCDiF4slgFfQS/3whyLXLcDbFb1Hv1oj7Hqz9EVDUSO2eEhgQGaOKkRc0CfAAOBwW6OvhE0xh7P1CJEjzOp6+3gI/LyZUNsqa+awVRZTsfm1YZaOPaPWJ7cI0uz3/OoSUeIecs4PDWPrQMGRlsrq7Q8="
     branches:
       - "2.2"
-      - .*/sonar
 
 script:
   - build-wrapper-linux-x86-64 --out-dir bw_output ./tools/commit-tests.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index caa24179a..a6a66a5a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 set(CMAKE_COLOR_MAKEFILE ON)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 11)
 
 set(RADIO_DIRECTORY ${PROJECT_SOURCE_DIR}/radio)
 set(RADIO_SRC_DIRECTORY ${RADIO_DIRECTORY}/src)
diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index f3bc9c2fd..c8ca02aa0 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -42,11 +42,11 @@ macro(git_id RESULT)
   endif()
 endmacro(git_id)
 
-macro(use_cxx14)
+macro(use_cxx11)
   if (CMAKE_VERSION VERSION_LESS "3.1" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set (CMAKE_CXX_FLAGS "--std=c++14 ${CMAKE_CXX_FLAGS}")
+    set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
   endif ()
-endmacro(use_cxx14)
+endmacro(use_cxx11)
 
 macro(PrintTargetReport targetName)
   if(CMAKE_CXX_COMPILER MATCHES "/cl\\.exe$")
diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 6b3eb1ffb..9343d71b9 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -96,7 +96,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
 
-use_cxx14()  # ensure c++14 in CXX_FLAGS with CMake < 3.1
+use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
 
 include_directories(
   ${CMAKE_BINARY_DIR}
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 836ae0618..f6b38b80a 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -523,6 +523,7 @@ void ModulePanel::update()
     ui->label_option->setText(qApp->translate("Multiprotocols", qPrintable(pdef.optionsstr)));
   }
 
+  // Failsafes
   ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
   ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
 
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 21374e181..987dd83ae 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -393,7 +393,7 @@ endforeach()
 add_definitions(-DCORRECT_NEGATIVE_SHIFTS)
 
 if(NOT MSVC)
-  set(WARNING_FLAGS "${WARNING_FLAGS} -Wall -Wno-strict-aliasing -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits -Wno-attributes")
+  set(WARNING_FLAGS "${WARNING_FLAGS} -Wall -Wno-strict-aliasing -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits")
   if(WARNINGS_AS_ERRORS)
     set(WARNING_FLAGS "${WARNING_FLAGS} -Werror")
   endif(WARNINGS_AS_ERRORS)
@@ -443,7 +443,7 @@ set(CMAKE_EXE_LINKER_FLAGS "")
 set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET>")
 set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET>")
 
-use_cxx14()  # ensure c++14 in CXX_FLAGS with CMake < 3.1
+use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
 
 find_program(BASH bash HINTS "c:/cygwin/bin/" "c:/msys/bin/" DOC "bash shell for firmware size report (eg. c:/cygwin/bin/bash.exe on Windows).")
 
diff --git a/radio/src/gui/480x272/menu_model.cpp b/radio/src/gui/480x272/menu_model.cpp
index c595be026..b0ec425e9 100644
--- a/radio/src/gui/480x272/menu_model.cpp
+++ b/radio/src/gui/480x272/menu_model.cpp
@@ -118,7 +118,7 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
             killEvents(event);
             break;
           }
-          [[fallthrough]];
+          // no break
 
         case EVT_KEY_LONG(KEY_LEFT):
         case EVT_KEY_LONG(KEY_RIGHT):
diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt
index a4e98d8de..332c3b78d 100644
--- a/radio/src/targets/simu/CMakeLists.txt
+++ b/radio/src/targets/simu/CMakeLists.txt
@@ -77,7 +77,7 @@ endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
 
-use_cxx14()  # ensure c++14 in CXX_FLAGS with CMake < 3.1
+use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
 
 if(FOX_FOUND)
   if(SIMU_DISKIO)
diff --git a/radio/src/tests/CMakeLists.txt b/radio/src/tests/CMakeLists.txt
index ec5fd0066..a8b0941e2 100644
--- a/radio/src/tests/CMakeLists.txt
+++ b/radio/src/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ if(GTEST_INCDIR AND GTEST_SRCDIR AND Qt5Widgets_FOUND)
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
 
-  use_cxx14()  # ensure c++14 in CXX_FLAGS with CMake < 3.1
+  use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
 
   add_executable(gtests EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp ../targets/simu/simufatfs.cpp)
   qt5_use_modules(gtests Core Widgets)