Not sure about the switch being a common thing. I've never had an issue on my TZ. The diverter is a known issue. I bought a magnet years ago that someone used to sell. It fits in the gate and keeps the ball from bouncing out before it gets dumped. I guess you could call it a mod, but it's really just a week magnet that you tape in the gate.