Fix schema_sanity issues.