Fix groups bugs