Fixes to Schematics