More file-dump changes