Corrections to the validator