More fixes to model