Fix validators