Several player ID related fixes