Fixing small issues with the importers