Latest OSGi related changes