Fix remaining XRC issues

[hjelmn]

Just to keep track of the Jenkins failure. I think I know what might be causing the remaining problem. @miked-mellanox I will fix and PR tonight.

[hjelmn]

@hppritcha This will fit in with the rest of the XRC fixes which should be reviewed tomorrow.