[Validator] smaller CS fixes