Fix Validator errors