Fixed some issues in the node-generators.