Updated patch to NodeManager.