Merge "Fix a few bugs introduced by the move to zip_archive."