Changes for node 10.x.x