More roster update fixups for api and data changes