Fixing wiring related problems