Configurable groups fixes