fix some more imports