Fix some bugs in the refactored Node.