Previous push was premature; using recent xa/wrap now