Bugfixes

Change to job