[HG] More configuration changes.