Fix some import problems