diff --git a/src/modules/commander/module.mk b/src/modules/commander/module.mk
index dac2ce59a6..0e2a5356be 100644
--- a/src/modules/commander/module.mk
+++ b/src/modules/commander/module.mk
@@ -52,5 +52,5 @@ MODULE_STACKSIZE = 1200
 
 MAXOPTIMIZATION	 = -Os
 
-EXTRACXXFLAGS = -Wframe-larger-than=1900
+EXTRACXXFLAGS = -Wframe-larger-than=2000
 
diff --git a/src/modules/mavlink/module.mk b/src/modules/mavlink/module.mk
index 91fdd61547..f9d30dcbea 100644
--- a/src/modules/mavlink/module.mk
+++ b/src/modules/mavlink/module.mk
@@ -53,4 +53,6 @@ MAXOPTIMIZATION	 = -Os
 
 MODULE_STACKSIZE = 1024
 
-EXTRACXXFLAGS	= -Weffc++
+EXTRACXXFLAGS	= -Weffc++ -Wno-attributes -Wno-packed
+
+EXTRACFLAGS	= -Wno-packed