Improvements on team swap.