Fixes for Group.