More fix for groups and compiler hook fix.