fixed some import issues