diff --git a/build/defaults.mak b/build/defaults.mak
index e7b364888..e90a2b158 100644
--- a/build/defaults.mak
+++ b/build/defaults.mak
@@ -8,7 +8,7 @@ CXXFLAGS = -std=c++11 -fno-exceptions -fno-rtti -fno-threadsafe-statics
 
 # Flags - Optimizations
 ifeq ($(DEBUG),1)
-SFLAGS = -O0 -g
+SFLAGS = -Og -g
 else
 SFLAGS = -Os
 endif
diff --git a/ion/src/f730/boot/flash.ld b/ion/src/f730/boot/flash.ld
index e5ddcc9e4..a6179f9f4 100644
--- a/ion/src/f730/boot/flash.ld
+++ b/ion/src/f730/boot/flash.ld
@@ -9,7 +9,7 @@
  * This will let us use shortcuts such as ">FLASH" to ask for a given section to
  * be stored in Flash. */
 MEMORY {
-  FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
+  FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
   SRAM (rw) : ORIGIN = 0x20000000, LENGTH = 256K
 }