Fixes for Xdr I/O with varying id sizes

I'm still running the tests on this.