2 Fixes and roster versioning support