Update a few straggling groupId refs