Fixing some import issues