diff --git a/src/components/__tests__/ConnectionDropMenu.test.tsx b/src/components/__tests__/ConnectionDropMenu.test.tsx
index 4cf61cf2..5e4ae0ca 100644
--- a/src/components/__tests__/ConnectionDropMenu.test.tsx
+++ b/src/components/__tests__/ConnectionDropMenu.test.tsx
@@ -245,7 +245,7 @@ describe("ConnectionDropMenu", () => {
     it("should wrap around when navigating past last item", () => {
       render(<ConnectionDropMenu {...defaultProps} handleType="text" connectionType="source" />);
 
-      // Text target labels: Prompt, Prompt Constructor, Array, Generate Image, Generate Video, Generate Audio, LLM Generate, Router, Switch, Conditional Switch (10 items)
+      // Text source labels: Prompt, Prompt Constructor, Array, Generate Image, Generate Video, Generate Audio, LLM Generate, Router, Switch, Conditional Switch (10 items)
       // Navigate down 10 times to wrap to first
       for (let i = 0; i < 10; i++) {
         fireEvent.keyDown(document, { key: "ArrowDown" });
diff --git a/src/components/__tests__/GenerateImageNode.test.tsx b/src/components/__tests__/GenerateImageNode.test.tsx
index fc695d56..077538ba 100644
--- a/src/components/__tests__/GenerateImageNode.test.tsx
+++ b/src/components/__tests__/GenerateImageNode.test.tsx
@@ -237,15 +237,6 @@ describe("GenerateImageNode", () => {
       expect(screen.getByText("Run to generate")).toBeInTheDocument();
     });
 
-    it("should render empty state placeholder when no output image", () => {
-      render(
-        <TestWrapper>
-          <GenerateImageNode {...createNodeProps({ status: "idle", outputImage: null })} />
-        </TestWrapper>
-      );
-
-      expect(screen.getByText("Run to generate")).toBeInTheDocument();
-    });
   });
 
   describe("Loading State", () => {
diff --git a/src/components/__tests__/GenerateVideoNode.test.tsx b/src/components/__tests__/GenerateVideoNode.test.tsx
index 92fe123e..d63e6acd 100644
--- a/src/components/__tests__/GenerateVideoNode.test.tsx
+++ b/src/components/__tests__/GenerateVideoNode.test.tsx
@@ -307,15 +307,6 @@ describe("GenerateVideoNode", () => {
       expect(screen.getByText("Run to generate")).toBeInTheDocument();
     });
 
-    it("should render empty state placeholder when no output video", () => {
-      render(
-        <TestWrapper>
-          <GenerateVideoNode {...createNodeProps({ status: "idle", outputVideo: null })} />
-        </TestWrapper>
-      );
-
-      expect(screen.getByText("Run to generate")).toBeInTheDocument();
-    });
   });
 
   describe("Loading State", () => {
diff --git a/src/components/nodes/AnnotationNode.tsx b/src/components/nodes/AnnotationNode.tsx
index 09a8afd5..a2e16228 100644
--- a/src/components/nodes/AnnotationNode.tsx
+++ b/src/components/nodes/AnnotationNode.tsx
@@ -126,7 +126,7 @@ export function AnnotationNode({ id, data, selected }: NodeProps<AnnotationNodeT
           <img
             src={displayImage}
             alt="Annotated"
-            className="w-full h-full object-cover"
+            className="w-full h-full object-contain"
           />
           <button
             onClick={(e) => {
diff --git a/src/store/execution/simpleNodeExecutors.ts b/src/store/execution/simpleNodeExecutors.ts
index ccb1f33c..8adf593a 100644
--- a/src/store/execution/simpleNodeExecutors.ts
+++ b/src/store/execution/simpleNodeExecutors.ts
@@ -323,7 +323,9 @@ export async function executeRouter(ctx: NodeExecutionContext): Promise<void> {
   // Brief status flash to show execution occurred.
   ctx.updateNodeData(ctx.node.id, { status: "loading" });
   await new Promise(resolve => setTimeout(resolve, 50));
-  ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  if (!ctx.signal?.aborted) {
+    ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  }
 }
 
 /**
@@ -334,7 +336,9 @@ export async function executeSwitch(ctx: NodeExecutionContext): Promise<void> {
   // Disabled outputs are filtered during traversal.
   ctx.updateNodeData(ctx.node.id, { status: "loading" });
   await new Promise(resolve => setTimeout(resolve, 50));
-  ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  if (!ctx.signal?.aborted) {
+    ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  }
 }
 
 /**
@@ -345,7 +349,9 @@ export async function executeConditionalSwitch(ctx: NodeExecutionContext): Promi
   // Brief status flash to show execution occurred.
   ctx.updateNodeData(ctx.node.id, { status: "loading" });
   await new Promise(resolve => setTimeout(resolve, 50));
-  ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  if (!ctx.signal?.aborted) {
+    ctx.updateNodeData(ctx.node.id, { status: "complete" });
+  }
 }
 
 /**