Fixed some changes with the queue