fix some import paths