more fixes to usage of importlib