Fixing import problems