schematics: fixes to make it work (tested)