Minor fixes to model