More changes to cn-node stuffs