Fix wiring event issues