Update some Player behaviour to match latest spec