Fixing cluster setup