Fix protobuf serialization of clustering