ibc: More subgroup fixes

Merge request reports