Cluster tweaks