Fix batch file screw ups