Survey case and cosmetic fixes to file import