final multinode fixes