Fixed validator errors