Bugfixes before merging in the new NodeDiff.