Minor changes to base and jobs/jobs