diff --git a/firmware/Makefile b/firmware/Makefile
index 2f15d6b..361adf2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -51,7 +51,7 @@ loadables: $(OUTFILE).bin
 clean:
 	rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex
 	@cd core && $(MAKE) clean
-	@cd tools && $(MAKE) clean
+	@cd ../tools/bootloader && $(MAKE) clean
 	@cd lcd && $(MAKE) clean
 	@cd modules && $(MAKE) clean
 	@cd filesystem && $(MAKE) clean
@@ -78,8 +78,8 @@ filesystem/libfat.a:
 usb/libusb.a:
 	cd usb && $(MAKE) ROOT_PATH=../$(ROOT_PATH)
 
-tools/lpcfix:
-	cd tools && $(MAKE) 
+../tools/bootloader/lpcfix:
+	cd ../tools/bootloader && $(MAKE) 
 
 $(LD_TEMP):
 	-@echo "MEMORY" > $(LD_TEMP)
diff --git a/firmware/Makefile.inc b/firmware/Makefile.inc
index 6762cdd..d4cafc1 100644
--- a/firmware/Makefile.inc
+++ b/firmware/Makefile.inc
@@ -26,7 +26,7 @@ SIZE = $(CROSS_COMPILE)size
 OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 OUTFILE = firmware
-LPCFIX = tools/lpcfix
+LPCFIX = ../tools/bootloader/lpcfix
 
 ifeq (LPC11xx,$(TARGET))
   CORTEX_TYPE=m0
diff --git a/tools/font/makefont.pl b/tools/font/makefont.pl
index aada3f9..c9b9adc 100755
--- a/tools/font/makefont.pl
+++ b/tools/font/makefont.pl
@@ -33,8 +33,7 @@ push @charlist,map {ord $_} qw(
 my ($verbose,$raw);
 my $size=18;
 
-my $font="../ttf/Ubuntu-Regular.ttf";
-$font="6x9.bdf";
+my $font="ttf/Ubuntu-Regular.ttf";
 
 GetOptions ("size=i"   => \$size,    # numeric
             "font=s"   => \$font,    # string