Fix validator issues