Queue class fixes