extra fixes to Queue class