Fix grade <-> team association.