Additional changes to flow-job.