Fix Validator issues