Fixing issues in importer