Validator: fix comments