Trying for fix OSGi import issues.