Schematic fixes