Bugfixes to dumper