Fix errors on CatalogManager