[master] Fix validators