Queue update (with memory leaks, but without fatals)