Minor changes to batch scripts