Fixed file importer, mostly