Tweaks on swapping control.