Group-related bug fixes