Player/minor fixes