Updated some validations.