Additional node.js fixes