Minor fixes to a validation rule