diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ JTENCODE_INCLUDES = -Ilib/jtencode
 # USER_CFLAGS: user C flags (enable warnings, enable debug info)
 USER_CFLAGS = -Wall -g -ffunction-sections -fdata-sections -Os -fno-common --function-sections -fdata-sections -flto
 # USER_LDFLAGS:  user LD flags
-USER_LDFLAGS = -fno-exceptions -ffunction-sections -fdata-sections -Wl,--gc-sections -flto
+USER_LDFLAGS = -flto -fno-exceptions -ffunction-sections -fdata-sections -Wl,--gc-sections 
 USER_LDFLAGS += --static
-# -nostartfiles 
+#USER_LDFLAGS += -nostartfiles 
 
 # TARGET_DEVICE: device to compile for
 TARGET_DEVICE = STM32F031x6
@@ -93,6 +93,7 @@ DEFS = -D$(CORE) $(USER_DEFS) -D$(TARGET
 
 # compile gcc flags
 CFLAGS = $(DEFS) $(INCLUDES)
+# EMZ: Maybe remove -msoft-float
 CFLAGS += -mcpu=$(CPU) -mthumb -msoft-float
 CFLAGS += $(USER_CFLAGS)
 
@@ -216,7 +217,7 @@ LDFLAGS = -T $(LD_SCRIPT) -L $(CUBELIB_B
 	$(CC) $(CFLAGS) -Os -c -o $@ $^
 
 $(BUILD_DIR)/%.o: src/%.s | $(BUILD_DIR)
-	$(CC) $(CFLAGS) -c -o $@ $^
+	$(CC) $(CFLAGS) -Os -c -o $@ $^
 
 $(BUILD_DIR):
 	$(MKDIR) $@