Fixed last validator errors