Fixup handling of node