Fixes for job_name