Fix OSGi wiring issues