Fixed some import issues