Fixes to SchemaExpander