Fix an issue with Player, but it's still borked.