OpenNI2 fixes (tested under clang)