Structure: Catalog Fixes