Fixes and new jobs