Bug fixes related to the new OpenNI2Generic