Minor changes with Job Types