Bug fixes for player again!