Cluster is not optional
Various cluster fixes