Player Bug fixes