More queue fixes