diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm
index 894e01db..6de8f38c 100644
--- a/build/buildtools/commondefs.firm
+++ b/build/buildtools/commondefs.firm
@@ -99,7 +99,7 @@ FIRM_LIBS ?= $(addsuffix $(FIRM_LIBSUFFIX).a,$(FIRM_LIBS_BASE))
 #  MY BUILD TOOLS
 #
 MAKENORFIRM		= $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makenorfirm.exe
-MAKENANDFIRM	= $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makenandfirm.exe
+MAKENANDFIRM		:= $(FIRM_TOOLSDIR)/bin/makenandfirm.exe
 MAKEGCDFIRM		= $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makegcdfirm.exe
 NTEXCONV		:= $(ROOT)/tools/bin/ntexconv.exe
 MAKEBANNER		:= $(TWL_TOOLSDIR)/bin/makebanner.TWL.exe
diff --git a/build/libraries/aes/ARM7/aes_init.c b/build/libraries/aes/ARM7/aes_init.c
index 2111b9c7..891dbec7 100644
--- a/build/libraries/aes/ARM7/aes_init.c
+++ b/build/libraries/aes/ARM7/aes_init.c
@@ -36,11 +36,6 @@
  *---------------------------------------------------------------------------*/
 void AESi_PreInitKeys( void )
 {
-    AES_WaitKey();
-
-    reg_AES_AES_ID_B2 = reg_OS_CHIP_ID1 ^ *(const u32*)&OSi_GetFromFirmAddr()->aes_key[2][0];
-    reg_AES_AES_ID_D1 = reg_OS_CHIP_ID0 ^ *(const u32*)&OSi_GetFromFirmAddr()->aes_key[2][8];
-    reg_AES_AES_ID_D2 = reg_OS_CHIP_ID1 ^ *(const u32*)&OSi_GetFromFirmAddr()->aes_key[2][4];
 }
 
 /*---------------------------------------------------------------------------*
diff --git a/tools/bin/makenandfirm.exe b/tools/bin/makenandfirm.exe
new file mode 100755
index 00000000..b686af30
Binary files /dev/null and b/tools/bin/makenandfirm.exe differ