queue fixes and container functor