Rotate queue fixes