Improved handling of jobs.