More FC's fixes: grouper as example