Further fixups for roster changes