Catalog: Small fixes and improvements