Fix validator errors