Fixed Validator errors