Fix validator warnings