Update Batch scripts

Verification:
    Run scripts, check if they all work as needed.

Change-Id: I8f591099022fc457dd0452a151bb8e8f48560d08