fix some groups issues