Minor updates for Cluster configuration.