Fix A/An stuff for senators
Update xpi