Bug fixes in queue_source