Small bug fixes to compile on osx, but still got failing xdr