Fix Queue interface