Fix schema_sanity issues 4.