Fixes to jobs