Jobs and organizations fix