Serialization client fixes