drc: patch up some potential issues on the switch