Fixes to switch smoothing logic