diff --git a/server/src/repo/manager2.rs b/server/src/repo/manager2.rs
index 2f66cfe..e4f0581 100644
--- a/server/src/repo/manager2.rs
+++ b/server/src/repo/manager2.rs
@@ -84,16 +84,16 @@ impl RepoMgr {
         let lock = lock.unwrap();
         let _guard = lock.lock().await;
 
-        let mut archs = db::Package::find()
+        let archs: Vec<String> = db::Package::find()
             .filter(db::package::Column::RepoId.eq(repo))
             .select_only()
             .column(db::package::Column::Arch)
             .distinct()
-            .into_tuple::<String>()
-            .stream(&self.conn)
+            .into_tuple()
+            .all(&self.conn)
             .await?;
 
-        while let Some(arch) = archs.next().await.transpose()? {
+        for arch in archs {
             self.generate_archives(repo, &arch).await?;
         }
 
diff --git a/server/src/repo/package.rs b/server/src/repo/package.rs
index 66c8fa1..df98559 100644
--- a/server/src/repo/package.rs
+++ b/server/src/repo/package.rs
@@ -397,6 +397,8 @@ pub async fn write_desc<W: AsyncWrite + std::marker::Unpin>(
         write_attribute(writer, key, &items.join("\n")).await?;
     }
 
+    writer.flush().await?;
+
     Ok(())
 }
 
@@ -417,5 +419,7 @@ pub async fn write_files<W: AsyncWrite + std::marker::Unpin>(
             .await?;
     }
 
+    writer.flush().await?;
+
     Ok(())
 }