More group-system fixes