Slight schematic part relocations