Edit Job Bugfixes