Cluster should be disabled by default, some minor fixes

Doesn't fix the stupid mixing of cluster vs. non-cluster setup but at
least it works.
3 files changed