Fix Message.Data serialization