Fix some playermanagement logic