fix import problems