Collection fix and queue enhancements