Added fixes to startup importer