Little changes to the Player handling