Minor wire_main fixes