Minor OSGi updates