fix some import errors