Fixed bugs with player