fixes for control groups on issue #707