Fix problem with order in which fields are pickled
Fix problem with nested collections