further fixes for roster update