Fixed player switching and key swapping