Accommodating changes to NodeId.
Fix for Clang warnings.
Merge pull request #66 from Fraser999/MAID-537

Accommodating changes to NodeId.