Attempt to fix import issues