Various improvements to make_dummy_files