Minor fixes in wiring.