Further support for OSGi/Fuse (6.1)