diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index c1ea6bdd..f691d096 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -12,10 +12,9 @@ set_property(TARGET zlibstatic PROPERTY FOLDER "contrib")
 set_property(TARGET lmdb PROPERTY FOLDER "contrib")
 
 
-
-
 if(MSVC)
   set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
 else()
-  set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
+  set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value -Wno-implicit-fallthrough -Wno-discarded-qualifiers ")
+  set_property(TARGET zlibstatic APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value -Wno-implicit-fallthrough -Wno-discarded-qualifiers ")
 endif()
diff --git a/contrib/db/liblmdb/CMakeLists.txt b/contrib/db/liblmdb/CMakeLists.txt
index 4a60e07c..8ec1a8d8 100644
--- a/contrib/db/liblmdb/CMakeLists.txt
+++ b/contrib/db/liblmdb/CMakeLists.txt
@@ -4,7 +4,7 @@ set (lmdb_sources mdb.c midl.c)
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 if(NOT MSVC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers -Wno-missing-braces -Wno-aggregate-return")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers -Wno-missing-braces -Wno-aggregate-return -Wno-discarded-qualifiers -Wno-unused-but-set-variable")
 endif()
 if(FREEBSD)
   add_definitions(-DMDB_DSYNC=O_SYNC)
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index e0fcc3b1..4953508d 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -475,7 +475,7 @@ bool boosted_tcp_server<t_protocol_handler>::init_server(uint32_t port, const st
 }
 //-----------------------------------------------------------------------------
 PUSH_WARNINGS
-DISABLE_GCC_WARNING(maybe - uninitialized)
+DISABLE_GCC_WARNING(maybe-uninitialized)
 template<class t_protocol_handler>
 bool boosted_tcp_server<t_protocol_handler>::init_server(const std::string port, const std::string& address)
 {