Fix job_runners and supervisor