Fixing import statements