Final fixes to get a working cluster.