Fix player-id inconsitancies