Some fixes while testing the importers