Couple band-aids in the dump script