Database/Queue simulation fixes.