ADT: Fixed XINDEX warnings