diff --git a/apps/makefile.common b/apps/makefile.common
index 5a45b18..1551ef5 100644
--- a/apps/makefile.common
+++ b/apps/makefile.common
@@ -1,9 +1,9 @@
 PREFIX:=riscv64-elf-
 OPT ?= -Os
 CFLAGS+=-I${TOPDIR}/common
-CFLAGS+=-fno-stack-protector -fno-builtin-memcpy -fno-builtin
+CFLAGS+=${OPT} -fno-stack-protector -fno-builtin-memcpy -fno-builtin
 CFLAGS+=-static-libgcc -fdata-sections -ffunction-sections
-CFLAGS+=-g ${OPT} -march=rv32im -mabi=ilp32 -static
+CFLAGS+=-g -march=rv32im -mabi=ilp32 -static
 LDFLAGS:= -T ${TOPDIR}/apps/linker.ld -nostdlib -Wl,--gc-sections
 LIBS:= -lgcc # needed for softfp
 
@@ -22,7 +22,7 @@ else
 endif
 
 all_common:
-	@${PREFIX}gcc -o ${PROJECT}.elf ${CFLAGS} ${LDFLAGS} ${SRCS} ${LIBS}
+	${PREFIX}gcc -o ${PROJECT}.elf ${CFLAGS} ${LDFLAGS} ${SRCS} ${LIBS}
 	@$(PREFIX)objcopy ${PROJECT}.elf -O binary ${PROJECT}.bin
 
 disasm_common: all
diff --git a/apps/maze/Makefile b/apps/maze/Makefile
index edb8bdf..7b4f5a1 100644
--- a/apps/maze/Makefile
+++ b/apps/maze/Makefile
@@ -1,7 +1,8 @@
 TOPDIR=../../
 PROJECT:=$(shell basename ${PWD})
 SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S
-OPT=-O0
+OPT=-O2
+CFLAGS+=-fpeel-loops
 all: all_common
 test: test_common
 clean: clean_common