Some more group handling fixes.