More changes to the v2 queue and DB systems.