Updates to fun with queues

Change-Id: Ie4d134a666e5225abfd8f371024652dc3d4261fe