fix various import errors