SC: Fixed XINDEX warnings