fix(schema): Fix checks to reduce false positives

fix(schema): Fix checks to reduce false positives #2185