Jobs improvements