Fix the XINFO numerics
Also another type further down