stampede queue fixes