Fix bugs in batch_job_chirp wrapper