Fixed a couple of bugs in Queue