Fixes to the class rosters