Random fixups
Importer cleanup