Fix roster saving/loading