Fixing roster bugs