Bugfixes on job manage