minor tweaks to model validations