Updated to NSIv2 r116 is now compiling
NSIv2 r116: all tests passing