Fix up PlayerData

See individual commit messages.