Fixing catalogs for upstream