Libs/Queues: Minor adjustments