Minimal changes to run.bat