Minor queue.mg cleanups