Minor enhancements to view model validation