Additional fixes for the overflow groups.