.bat file tidy up plus shake-0.16 compatibility (#392)