Fix job-related methods