Fix schema_sanity issues 2.