Fixed a few errors while removing some part of the player queue.