Bug fixes to RockstarCatalogue