diff --git a/firmware/Makefile b/firmware/Makefile
index 1e44ccc93f..2d8c55faf9 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -9,7 +9,7 @@ CHIBIOS = chibios
 # Compiler options here.
 ifeq ($(USE_OPT),)
 #  USE_OPT = $(RFLAGS) -O1 -fgnu89-inline -ggdb -fomit-frame-pointer -falign-functions=16 -std=gnu99 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers
-  USE_OPT = $(RFLAGS) -O1 -fgnu89-inline       -fomit-frame-pointer -falign-functions=16 -std=gnu99 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers
+  USE_OPT = $(RFLAGS) -O1 -fgnu89-inline       -fomit-frame-pointer -falign-functions=16 -std=gnu99 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Werror=type-limits
 endif
 
 # C specific options here (added to USE_OPT).
@@ -19,7 +19,7 @@ endif
 
 # C++ specific options here (added to USE_OPT).
 ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -std=c++11 -fno-rtti -fno-exceptions -fno-use-cxa-atexit -Werror=write-strings
+  USE_CPPOPT = -std=c++11 -fno-rtti -fno-exceptions -fno-use-cxa-atexit -Werror=write-strings -Werror=type-limits
 endif
 
 # Enable this if you want the linker to remove unused code and data
diff --git a/firmware/hw_layer/flash.c b/firmware/hw_layer/flash.c
index ff0e284a21..76993de734 100644
--- a/firmware/hw_layer/flash.c
+++ b/firmware/hw_layer/flash.c
@@ -146,7 +146,7 @@ bool flashIsErased(flashaddr_t address, size_t size) {
 		size -= sizeof(flashdata_t);
 	}
 	while (size > 0) {
-		if (*(char*) address != 0xff)
+		if (*(char*) address != 0xFF)
 			return false;
 		++address;
 		--size;
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 6c26853d32..75ed3664a4 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Tue Dec 23 15:27:13 EST 2014
+// Sat Dec 27 09:45:34 EST 2014
 #ifndef VCS_VERSION
-#define VCS_VERSION "5874"
+#define VCS_VERSION "5964"
 #endif