More Player Bug Fixes