Fixes to groups