Switch to saucy with the xva as well