Fixed some import problems