Fixes to RankedModel row_order setup