Cluster fixes