Schematic import fixes