Minor updates to batch script