More OSGi fiddling