Tweaks to ClusterInterface