Job execution fixes