diff --git a/flight/OpenPilot/Makefile b/flight/OpenPilot/Makefile
index 43cd77681..603de213b 100644
--- a/flight/OpenPilot/Makefile
+++ b/flight/OpenPilot/Makefile
@@ -399,7 +399,7 @@ ifeq ($(CODE_SOURCERY), YES)
 CFLAGS += -fpromote-loop-indices
 endif
 
-CFLAGS += -Wall
+CFLAGS += -Wall -Werror
 CFLAGS += -Wa,-adhlns=$(addprefix $(OUTDIR)/, $(notdir $(addsuffix .lst, $(basename $<))))
 # Compiler flags to generate dependency files:
 CFLAGS += -MD -MP -MF $(OUTDIR)/dep/$(@F).d
diff --git a/flight/OpenPilot/System/openpilot.c b/flight/OpenPilot/System/openpilot.c
index 42c9396ee..924e920ce 100644
--- a/flight/OpenPilot/System/openpilot.c
+++ b/flight/OpenPilot/System/openpilot.c
@@ -44,17 +44,22 @@
 /* Global Variables */
 
 /* Local Variables */
+#define INCLUDE_TEST_TASKS 0
+#if INCLUDE_TEST_TASKS
 static uint8_t sdcard_available;
+#endif
 FILEINFO File;
 char Buffer[1024];
 uint32_t Cache;
 
 /* Function Prototypes */
+#if INCLUDE_TEST_TASKS
 static void TaskTick(void *pvParameters);
 static void TaskTesting(void *pvParameters);
 static void TaskHIDTest(void *pvParameters);
 static void TaskServos(void *pvParameters);
 static void TaskSDCard(void *pvParameters);
+#endif
 int32_t CONSOLE_Parse(COMPortTypeDef port, char c);
 void OP_ADC_NotifyChange(uint32_t pin, uint32_t pin_value);
 
@@ -146,6 +151,7 @@ void OpenPilotInit()
 	//xTaskCreate(TaskSDCard, (signed portCHAR *)"SDCard", configMINIMAL_STACK_SIZE, NULL, (tskIDLE_PRIORITY + 2), NULL);
 }
 
+#if INCLUDE_TEST_TASKS
 static void TaskTesting(void *pvParameters)
 {
 	portTickType xDelay = 250 / portTICK_RATE_MS;
@@ -200,7 +206,9 @@ static void TaskTesting(void *pvParameters)
 		vTaskDelay(xDelay);
 	}
 }
+#endif
 
+#if INCLUDE_TEST_TASKS
 static void TaskHIDTest(void *pvParameters)
 {
 	uint8_t byte;
@@ -240,7 +248,9 @@ static void TaskHIDTest(void *pvParameters)
 		}
 	}
 }
+#endif
 
+#if INCLUDE_TEST_TASKS
 static void TaskServos(void *pvParameters)
 {
 	/* For testing servo outputs */
@@ -308,7 +318,9 @@ static void TaskServos(void *pvParameters)
 		}
 	}
 }
+#endif
 
+#if INCLUDE_TEST_TASKS
 static void TaskSDCard(void *pvParameters)
 {
 	uint16_t second_delay_ctr = 0;
@@ -347,4 +359,5 @@ static void TaskSDCard(void *pvParameters)
 		}
 	}
 }
+#endif
 
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c
index 8f251b08f..10f20168f 100644
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c
+++ b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c
@@ -53,7 +53,7 @@ int dosfs_ini_read(char *buffer, int size, PFILEINFO file)
 	return 1;
 }
 
-int dosfs_ini_write(char *buffer, PFILEINFO file)
+int dosfs_ini_write(const char *buffer, PFILEINFO file)
 {
 	/* TODO: Check this works */
 	DFS_WriteFile(file, PIOS_SDCARD_Sector, (uint8_t *)buffer, &SuccessCount, sizeof(buffer));
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h
index 242989608..e7e5e6e9d 100644
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h
+++ b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h
@@ -21,7 +21,7 @@ extern int dosfs_ini_openread(const char *filename, PFILEINFO file);
 extern int dosfs_ini_openwrite(const char *filename, PFILEINFO file);
 extern int dosfs_ini_close(PFILEINFO file);
 extern int dosfs_ini_read(char *buffer, int size, PFILEINFO file);
-extern int dosfs_ini_write(char *buffer, PFILEINFO file);
+extern int dosfs_ini_write(const char *buffer, PFILEINFO file);
 extern int dosfs_ini_rename(const char *source, const char *dest);
 extern int dosfs_ini_remove(const char *filename);
 extern int dosfs_ini_rewind(PFILEINFO file);