Minimum changes to get downloads to build with refactored verbatim fields