Fixed some import problems again