Batch of fixes for Zenodo