Rework vat dump a bit to be more reliable