Update to latest QueuePtr