Schematic tweaks