Minor changes to Validator.