Fixed the issues in JobDispatcher