Fix group management.