Trying to fix import problems