fixed a few problems with the two instances per node setup