Fixing issues with the node upgrading from 1.5.8 to 2.0.0

Fixing issues with the node upgrading from 1.5.8 to 2.0.0 #5880