OSGi/catalog improvements