Couple of small changes to clean up NoDump totals