OSGi/catalog improvements

sure