Fix problems with cluster.conf build