Fix XC changes