Rectify Job model and fix some controller errors