Fix xfr some more