Bug fixes and warning alleviation

...nNode, for correctness (and to quiet an Xcode warning) the actual node from the enumeration should be used.