HPCC-8551 Fix additional issues with serialization

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>