diff --git a/flight/PiOS/Boards/STM32F4xx_RevoMini.h b/flight/PiOS/Boards/STM32F4xx_RevoMini.h
index 3421afd9a..680b26276 100644
--- a/flight/PiOS/Boards/STM32F4xx_RevoMini.h
+++ b/flight/PiOS/Boards/STM32F4xx_RevoMini.h
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 
 #if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
-#define DEBUG_LEVEL 2
+#define DEBUG_LEVEL 0
 #define DEBUG_PRINTF(level, ...) {if(level <= DEBUG_LEVEL && pios_com_debug_id > 0) { PIOS_COM_SendFormattedStringNonBlocking(pios_com_debug_id, __VA_ARGS__); }}
 #else
 #define DEBUG_PRINTF(level, ...)
diff --git a/flight/RevoMini/System/inc/pios_config.h b/flight/RevoMini/System/inc/pios_config.h
index 2507b0cc6..8f8fbe9ba 100644
--- a/flight/RevoMini/System/inc/pios_config.h
+++ b/flight/RevoMini/System/inc/pios_config.h
@@ -54,6 +54,7 @@
 //#define PIOS_INCLUDE_GPIO
 #define PIOS_INCLUDE_EXTI
 #define PIOS_INCLUDE_RTC
+#define PIOS_INCLUDE_WDG
 
 /* Variables related to the RFM22B functionality */
 #define PIOS_INCLUDE_RFM22B
diff --git a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
index e5fcbcaa5..b8393b19c 100755
--- a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
+++ b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
@@ -118,7 +118,7 @@ void inputChannelForm::groupUpdated()
         count = 18;
         break;
     case ManualControlSettings::CHANNELGROUPS_GCS:
-        count = 8;
+        count = GCSReceiver::CHANNEL_NUMELEM;
         break;
     case ManualControlSettings::CHANNELGROUPS_NONE:
         count = 0;