Apply fixes to make.bat suggested by Osore​Watashi.