Minor bugfixes from the Player rehaul.