diff --git a/Cargo.toml b/Cargo.toml
index 81a1be4e96..fdcad3f310 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -655,6 +655,16 @@ lto = "fat"
 codegen-units = 1
 opt-level = 3
 
+# Release-grade optimization with DWARF line info and no symbol stripping so
+# heaptrack can resolve native allocation backtraces during leak investigation.
+# Uses thin LTO and more codegen units to keep frames un-inlined and builds fast.
+[profile.profiling]
+inherits = "release"
+debug = 1
+lto = "thin"
+codegen-units = 16
+strip = false
+
 [profile.quick]
 inherits = "dev"
 debug = false          # no debug info → faster link, smaller binary
diff --git a/examples/kitchen-sink/src/server.ts b/examples/kitchen-sink/src/server.ts
index f1e5ba9d70..bdac261b7c 100644
--- a/examples/kitchen-sink/src/server.ts
+++ b/examples/kitchen-sink/src/server.ts
@@ -1,6 +1,9 @@
+import { existsSync, readFileSync } from "node:fs";
 import type { Server as HttpServer } from "node:http";
+import { resolve } from "node:path";
 import * as v8 from "node:v8";
 import { serve } from "@hono/node-server";
+import { serveStatic } from "@hono/node-server/serve-static";
 import { Hono } from "hono";
 import { registry } from "./index.ts";
 import { resolveMode } from "./mode.ts";
@@ -164,6 +167,23 @@ if (mode === "serverful") {
 	app.all("/api/rivet", (c) => registry.handler(c.req.raw));
 }
 
+// Serve the built frontend when it is present. The Vite build emits `dist/`,
+// which only exists in production images, so dev runs skip this branch.
+const distDir = "dist";
+const indexPath = resolve(process.cwd(), distDir, "index.html");
+if (existsSync(indexPath)) {
+	app.use("/*", serveStatic({ root: distDir }));
+	const indexHtml = readFileSync(indexPath, "utf8");
+	app.get("/*", (c) => {
+		const path = new URL(c.req.url).pathname;
+		const last = path.slice(path.lastIndexOf("/") + 1);
+		// Fall through to 404 for asset-like paths so missing files do not
+		// resolve to the SPA shell.
+		if (last.includes(".")) return c.notFound();
+		return c.html(indexHtml);
+	});
+}
+
 const server = serve({ fetch: app.fetch, port }, () => {
 	if (mode === "serverful") {
 		console.log(
diff --git a/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs b/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
index 34cf0b172b..2ae2d0bb70 100644
--- a/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
+++ b/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
@@ -181,21 +181,40 @@ async fn run_event_loop(
 	dirty: &Arc<AtomicBool>,
 	events: &mut ActorEvents,
 ) {
-	while let Some(event) = events.recv().await {
+	loop {
 		pump_registered_tasks(tasks, registered_task_rx);
-		dispatch_event(
-			event,
-			bindings,
-			config,
-			ctx,
-			abort,
-			tasks,
-			registered_task_rx,
-			dirty,
-		)
-		.await;
-		if ctx.has_end_reason() {
-			break;
+
+		tokio::select! {
+			// Reap completed background tasks as they finish. A tokio JoinSet
+			// retains each finished task's allocation until it is joined, so
+			// without this the set grows for the entire actor lifetime and
+			// shows up as native (non-V8) RSS growth.
+			Some(result) = tasks.join_next(), if !tasks.is_empty() => {
+				if let Err(error) = result {
+					if !error.is_cancelled() {
+						tracing::error!(?error, "napi background task failed to join");
+					}
+				}
+			}
+			event = events.recv() => {
+				let Some(event) = event else {
+					break;
+				};
+				dispatch_event(
+					event,
+					bindings,
+					config,
+					ctx,
+					abort,
+					tasks,
+					registered_task_rx,
+					dirty,
+				)
+				.await;
+				if ctx.has_end_reason() {
+					break;
+				}
+			}
 		}
 	}
 }