OSGi/catalog improvements

agree, fixing