Fix tokens after groups upgrade