Fixes to group editing...