Fix validator constraints