Fix some import problems.