Compilation with new XDI2 changes