Fixed two bugs in Importer