Fixed JOB issues