Fixes on player