Small fixes for the catalog registration

Note: this hasn't been tested.