diff --git a/sys/winnt/windmain.c b/sys/winnt/windmain.c
index ce1781193..91baad75b 100644
--- a/sys/winnt/windmain.c
+++ b/sys/winnt/windmain.c
@@ -471,6 +471,11 @@ char *argv[];
                     argv++;
                     iflags.fuzzer_stop_and_save = atoi(*argv);
 
+                    /* turn off getreturn_enabled so that game does not
+                     * prompt for input when exiting
+                     */
+                    getreturn_enabled = FALSE;
+
                     if (argc > 1 && argv[1][0] != '-') {
                         argc--;
                         argv++;
@@ -800,7 +805,9 @@ getlock()
 {
     register int fd, c, ci, ct, ern;
     int fcmask = FCMASK;
+#ifndef SELF_RECOVER
     char tbuf[BUFSZ];
+#endif
     const char *fq_lock;
 #define OOPS_BUFSZ 512
     char oops[OOPS_BUFSZ];
diff --git a/win/win32/scripts/fuzzer/longtest.bat b/win/win32/scripts/fuzzer/longtest.bat
index 64b6286bd..d1e1586e7 100644
--- a/win/win32/scripts/fuzzer/longtest.bat
+++ b/win/win32/scripts/fuzzer/longtest.bat
@@ -3,17 +3,7 @@ echo off
 SETLOCAL ENABLEEXTENSIONS
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-set STEP_SIZE=5000
-set FINAL_MOVE=500000
-set START_MOVE=5000
-
-set BIN_DIR=..\..\..\..\bin\Debug\Win32
-set SAVED_GAME=%USERNAME%-wizard.NetHack-saved-game
-set LOG_FILE=%BIN_DIR%\runtil.log
-set FUZZER_LOG=%BIN_DIR%\fuzzer.log
-set FUZZER_DIR=%BIN_DIR%\fuzzer
-set SAVE_DIR=%FUZZER_DIR%\save
-set BASELINE=%FUZZER_DIR%\fuzzer.log
+call setenv.bat
 
 if exist %FUZZER_DIR% rmdir /s /q %FUZZER_DIR%
 
diff --git a/win/win32/scripts/fuzzer/restore.bat b/win/win32/scripts/fuzzer/restore.bat
index 9752fed96..b411ea857 100644
--- a/win/win32/scripts/fuzzer/restore.bat
+++ b/win/win32/scripts/fuzzer/restore.bat
@@ -1,7 +1,4 @@
 call clean.bat
-
-set BIN_DIR=..\..\..\..\bin\Debug\Win32
-set SAVED_GAME=%USERNAME%-wizard.NetHack-saved-game
-set FUZZER_DIR=%BIN_DIR%\fuzzer
+call setenv.bat
 
 copy %FUZZER_DIR%\%SAVED_GAME% %BIN_DIR%\%SAVED_GAME%
diff --git a/win/win32/scripts/fuzzer/runtill.bat b/win/win32/scripts/fuzzer/runtill.bat
index cdbd954f3..e67ddfd17 100644
--- a/win/win32/scripts/fuzzer/runtill.bat
+++ b/win/win32/scripts/fuzzer/runtill.bat
@@ -1,7 +1,7 @@
 REM
 REM runtill target_move
 REM 
-echo off
+echo on
 
 SETLOCAL ENABLEEXTENSIONS
 SETLOCAL ENABLEDELAYEDEXPANSION
@@ -13,13 +13,7 @@ if %TARGET_MOVE% == "" (
   goto :eof
 )
 
-set BIN_DIR=..\..\..\..\bin\Debug\Win32
-set SAVED_GAME=%USERNAME%-wizard.NetHack-saved-game
-set LOG_FILE=%BIN_DIR%\runtil.log
-set FUZZER_LOG=%BIN_DIR%\fuzzer.log
-set FUZZER_DIR=%BIN_DIR%\fuzzer
-set SAVE_DIR=%FUZZER_DIR%\save
-set BASELINE=%FUZZER_DIR%\fuzzer.log
+call setenv.bat
 
 if not exist %FUZZER_DIR% mkdir %FUZZER_DIR%
 if not exist %SAVE_DIR% mkdir %SAVE_DIR%
@@ -37,7 +31,6 @@ call restore.bat
 
 %BIN_DIR%\nethack -D -F %TARGET_MOVE%
 
-move %BIN_DIR%\*.snap %BIN_DIR%\snapshots
 copy %FUZZER_LOG% %BASELINE%
 
 for /f "tokens=2,3 delims=: usebackq" %%i in (`findstr /c:START %BASELINE%`) do (
diff --git a/win/win32/scripts/fuzzer/setenv.bat b/win/win32/scripts/fuzzer/setenv.bat
new file mode 100644
index 000000000..3b3807371
--- /dev/null
+++ b/win/win32/scripts/fuzzer/setenv.bat
@@ -0,0 +1,13 @@
+echo on
+
+set STEP_SIZE=5000
+set FINAL_MOVE=500000
+set START_MOVE=5000
+
+set BIN_DIR=..\..\..\..\bin\Debug\Win32
+set SAVED_GAME=wizard.NetHack-saved-game
+set LOG_FILE=%BIN_DIR%\runtil.log
+set FUZZER_LOG=%BIN_DIR%\fuzzer.log
+set FUZZER_DIR=%BIN_DIR%\fuzzer
+set SAVE_DIR=%FUZZER_DIR%\save
+set BASELINE=%FUZZER_DIR%\fuzzer.log