Fixed up player tracking