Fixes to Jobs