Small fixes, DRC pass (almost)