Merge roster fixes from waqas