fix import errors
9 files changed