Fix some import errors