Fixing up groups a bit.