fixed some import errors