Get the generated XDR to line up