fix some groups fixes