Some more fixes in GroupSet