fix XS types