diff --git a/configure b/configure
index c881a8a..7427c30 100755
--- a/configure
+++ b/configure
@@ -64,10 +64,6 @@ Size limits:
   --atexit-max=NUM     Number of exit handlers in atexit()'s array [16]
 
 Deprecated options (to be removed):
-  -extended-libc       Provide a few C99 headers (in the future, refer to the
-                       newlib port by Memallox's for the standard library)
-  -timer-slots=<n>     Number of virtual timer slots (this feature will be
-                       moved to an independent library) [16]
   -events-queue-size=<n>
                        Size of event queue (this mechanism is likely to
                        disappear in future versions) [64]
@@ -135,10 +131,6 @@ for arg; do case "$arg" in
     echo "error: '$arg' expects a value (see '$0 --help')";
     fail=true;;
 
-  -extended-libc)
-    echo "warning: support for '-extended-libc' has been removed";;
-  -timer-slots=*)
-    echo "warning: support for '-timer-slots' has been removed";;
   -events-queue-size=*)
     echo "warning: support for '-events-queue-size' has been removed";;
 
diff --git a/make/Makefile b/make/Makefile
index 3a413da..5edb015 100755
--- a/make/Makefile
+++ b/make/Makefile
@@ -17,11 +17,12 @@ endif
 include $(CONFIG)
 
 # Machine flags, defaults are provided for common toolchains
+
 ifeq "$(CONFIG.TOOLCHAIN)" "sh3eb-elf"
-machine := -m3 -mb
+machine ?= -m3 -mb
 endif
 ifeq "$(CONFIG.TOOLCHAIN)" "sh4eb-elf"
-machine := -m4-nofpu -mb
+machine ?= -m4-nofpu -mb
 endif
 
 # Compiler flags, assembler flags, dependency generation, archiving
@@ -106,11 +107,13 @@ src/%.c.o: ../src/%.c src/%.c.d
 # Special files
 $(call src2obj,../src/font5x7.png): ../src/font5x7.png
 	@ mkdir -p $(dir $@)
-	$(call cmd_m,fxconv,font5x7.png)$(conv) -f $< -o $@ name:gint_font5x7 \
+	$(call cmd_m,fxconv,font5x7.png)$(conv) -f $< -o $@ \
+		--fx --toolchain=$(CONFIG.TOOLCHAIN) name:gint_font5x7 \
 		charset:ascii grid.size:5x7 grid.padding:1 grid.border:0
 $(call src2obj,../src/font8x9.png): ../src/font8x9.png
 	@ mkdir -p $(dir $@)
-	$(call cmd_m,fxconv,font8x9.png)$(conv) -f $< -o $@ name:gint_font8x9 \
+	$(call cmd_m,fxconv,font8x9.png)$(conv) -f $< -o $@ \
+		--cg --toolchain=$(CONFIG.TOOLCHAIN) name:gint_font8x9 \
 		charset:print grid.size:8x11 grid.padding:1 grid.border:0 \
 		proportional:true