Fixing import bugs