Fixing catalogs for upstream

Fixing catalogs for upstream