Misc importer fixes