queue fixes
merge