fixes for job scheduler