diff --git a/flight/modules/ManualControl/manualcontrol.c b/flight/modules/ManualControl/manualcontrol.c
index 4de61af46..a721b0a91 100644
--- a/flight/modules/ManualControl/manualcontrol.c
+++ b/flight/modules/ManualControl/manualcontrol.c
@@ -113,7 +113,7 @@ static const controlHandler handler_PATHPLANNER = {
     .handler           = &pathPlannerHandler,
 };
 
-#endif
+#endif /* ifndef PIOS_EXCLUDE_ADVANCED_FEATURES */
 // Private variables
 static DelayedCallbackInfo *callbackHandle;
 
diff --git a/flight/modules/StateEstimation/filteraltitude.c b/flight/modules/StateEstimation/filteraltitude.c
index 26f9598b4..eac70bcf9 100644
--- a/flight/modules/StateEstimation/filteraltitude.c
+++ b/flight/modules/StateEstimation/filteraltitude.c
@@ -41,12 +41,12 @@
 // duration of accel bias initialization phase
 #define INITIALIZATION_DURATION_MS 5000
 
-#define STACK_REQUIRED 128
+#define STACK_REQUIRED             128
 
-#define DT_ALPHA       1e-2f
-#define DT_MIN         1e-6f
-#define DT_MAX         1.0f
-#define DT_AVERAGE     1e-3f
+#define DT_ALPHA                   1e-2f
+#define DT_MIN                     1e-6f
+#define DT_MAX                     1.0f
+#define DT_AVERAGE                 1e-3f
 static volatile bool reloadSettings;
 
 // Private types
diff --git a/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h b/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
index d589d20ed..13697942d 100644
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
@@ -169,10 +169,10 @@
 #endif
 #define PIOS_TELEM_RX_STACK_SIZE        410
 #define PIOS_TELEM_TX_STACK_SIZE        560
-#define PIOS_EVENTDISPATCHER_STACK_SIZE  95
+#define PIOS_EVENTDISPATCHER_STACK_SIZE 95
 
 /* This can't be too high to stop eventdispatcher thread overflowing */
-#define PIOS_EVENTDISAPTCHER_QUEUE       10
+#define PIOS_EVENTDISAPTCHER_QUEUE      10
 
 /* Revolution series */
 /* #define REVOLUTION */
diff --git a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
index 534eca823..886f983b9 100644
--- a/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
@@ -86,7 +86,7 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
     HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
     HwSettings::DataFields hwSettingsData = hwSettings->getData();
 
-    if(hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_GPS] != HwSettings::OPTIONALMODULES_ENABLED) {
+    if (hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_GPS] != HwSettings::OPTIONALMODULES_ENABLED) {
         m_telemetry->gpsProtocol->setEnabled(false);
         m_telemetry->gpsProtocol->setToolTip(tr("Enable GPS module and reboot the board to be able to select GPS protocol"));
     } else {