Rollup of Queue and Library Fixes