Small changes to the validator