Fix HeaderAndBody event serializer