Small changes to importer.