Fixes to job scripts