Importer fixes
Misc fixes