Make vnode management somewhat more correct.