Add remaining archivers patches and overrides