Fix validator compatibility