Fix marshalling/unmarshalling.
Re-generate distribution.