Fixed some import bugs.