Fixes and jobs