Fixed a couple issues with catalog creation.