Minor fixes found when update groups module