Fixed more bugs relating to new job framework