[Validator] CS fixes