Couple xenoarch fixes