Re-enable roster sorting and associated fixups
More roster update fixups for api and data changes