Jobs More Fixes