Some inchi fixes

fixed import issues