Fix up the groupIds that were wrong