Bugfixes for schematic