Bug fixes in Importer