Minor modifications to the Windows build & run tools