fix some import issues