More fixes for the dump