diff --git a/nshlib/nsh_dbgcmds.c b/nshlib/nsh_dbgcmds.c
index c86d77109..cc67a2708 100644
--- a/nshlib/nsh_dbgcmds.c
+++ b/nshlib/nsh_dbgcmds.c
@@ -395,6 +395,7 @@ int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
   buffer = (FAR uint8_t *)malloc(IOBUFFERSIZE);
   if(buffer == NULL)
     {
+      (void)close(fd);
       nsh_output(vtbl, g_fmtcmdfailed, "hexdump", "malloc", NSH_ERRNO);
       return ERROR;
     }
diff --git a/tools/mkkconfig.bat b/tools/mkkconfig.bat
index cc58b8527..e7865cca2 100755
--- a/tools/mkkconfig.bat
+++ b/tools/mkkconfig.bat
@@ -75,6 +75,9 @@ REM     GOTO :End
 REM   )
 )
 
+REM Get the current directory
+SET APPSDIR=%~dp0
+
 Echo # > %kconfig%
 Echo # For a description of the syntax of this configuration file, >> %kconfig%
 Echo # see the file kconfig-language.txt in the NuttX tools repository. >> %kconfig%
@@ -89,10 +92,9 @@ IF %menu% NEQ "" (
 
 DIR /B /A:D >_tmp_.dat
 
-Echo source "$APPSDIR/builtin/Kconfig" >> %kconfig%
 FOR /F "tokens=*" %%s IN (_tmp_.dat) do (
   IF EXIST %%s\Kconfig (
-    Echo source "$APPSDIR/%%s/Kconfig" >> %kconfig%
+    Echo source "%APPSDIR%/%%s/Kconfig" >> %kconfig%
   )
 )
 DEL _tmp_.dat