More xfr fixes, does not work yet