Fix offset issues for HandleScrambleTeams