Refactor handling of temporary jobs
Fix labour spec