OSGi/catalog improvements 2