Fixed OSGi issues.