Minor tweaks: working on getting services in catalogs