Fixes to node related