Fixing import issues