Fix schema_sanity issues 3.