Minor fixes and simplifications catalogs/participants