Various fixes to the ZDT collector