Fixes to Rdc serialization.