Some OSGi manifest fixes