small changes in the validators.