Minor XCHG updates