More fixes to the model