XDI2 maintenance and other tools