Minor tweaks: working on services in catalogs.