Minor fixes to Model.