Fixing various bugs in job calling