diff --git a/skillhub-cli/src/commands/download.ts b/skillhub-cli/src/commands/download.ts
index 8e963e6a5..8b6e27d7a 100644
--- a/skillhub-cli/src/commands/download.ts
+++ b/skillhub-cli/src/commands/download.ts
@@ -1,6 +1,7 @@
 import { Command } from "commander";
 import { createWriteStream } from "node:fs";
 import { resolve } from "node:path";
+import { finished } from "node:stream/promises";
 import { ApiClient } from "../core/api-client.js";
 import { ApiRoutes } from "../schema/routes.js";
 import { loadConfig } from "../core/config.js";
@@ -57,7 +58,7 @@ export function registerDownload(program: Command) {
 
         const outPath = resolve(outputDir, `${skillSlug}.zip`);
         const fileStream = createWriteStream(outPath);
-        await body.pipe(fileStream);
+        await finished(body.pipe(fileStream));
 
         spinner.succeed(`Downloaded ${skillSlug} to ${outPath}`);
       } catch (e: any) {
diff --git a/skillhub-cli/src/commands/install.ts b/skillhub-cli/src/commands/install.ts
index 840ecf572..1217308e1 100644
--- a/skillhub-cli/src/commands/install.ts
+++ b/skillhub-cli/src/commands/install.ts
@@ -468,9 +468,9 @@ async function installFromRegistry(slug: string, opts: Record<string, string | s
       if (result.success) {
         installed++;
         await addToLock(skill.name, {
-          source: `${ns}/${slug}`,
+          source: `${ns}/${actualSlug}`,
           sourceType: "registry",
-          sourceUrl: `${config.registry}/api/v1/skills/${ns}/${slug}`,
+          sourceUrl: `${config.registry}/api/v1/skills/${ns}/${actualSlug}`,
           namespace: ns,
           slug: skill.name,
           version: "latest",
diff --git a/skillhub-cli/src/commands/update.ts b/skillhub-cli/src/commands/update.ts
index 974342fb0..736863e42 100644
--- a/skillhub-cli/src/commands/update.ts
+++ b/skillhub-cli/src/commands/update.ts
@@ -7,10 +7,7 @@ import { searchMultiselect, cancelSymbol } from "../utils/search-multiselect.js"
 
 function getCliCommand(): string {
   const cliPath = process.argv[1];
-  if (cliPath && cliPath.endsWith("cli.mjs")) {
-    return `node "${cliPath}"`;
-  }
-  return "node dist/cli.mjs";
+  return `node "${cliPath}"`;
 }
 
 export function registerUpdate(program: Command) {