Hacky fixes for player switching.