Minor OSGi cleanup