Fix to NodeManager interface