Misc fixes as wiring proceeds.