Minor fixes to model validation