Some fixes for groups