Fixed some remaining XA references