Fixing import errors