diff --git a/src/app/App.tsx b/src/app/App.tsx
index 1fea4130..90c132a6 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -12091,7 +12091,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
                   visibilityTargetOptions={sequenceVisibilityTargetOptions}
                   scheduler={editorState.projectDocument.scheduler}
                   sequences={editorState.projectDocument.sequences}
-                  dialogues={editorState.projectDocument.dialogues}
+                  npcTalkTargetOptions={npcDialogueSequenceTargetOptions}
                   selectedRoutineId={selectedScheduleRoutineId}
                   selectedSequenceId={selectedSequenceId}
                   onSelectRoutine={setSelectedScheduleRoutineId}
@@ -12338,7 +12338,7 @@ export function App({ store, initialStatusMessage }: AppProps) {
                     )
                   }
                   onAddControlEffect={handleAddProjectSequenceControlEffect}
-                  onAddDialogueStep={handleAddProjectSequenceDialogueStep}
+                  onAddNpcTalkEffect={handleAddProjectSequenceNpcTalkStep}
                   onAddTeleportStep={handleAddProjectSequenceTeleportStep}
                   onAddSceneTransitionStep={
                     handleAddProjectSequenceSceneTransitionStep
@@ -12368,8 +12368,11 @@ export function App({ store, initialStatusMessage }: AppProps) {
                   onSetControlStepPathLoop={
                     updateProjectSequenceControlStepPathLoop
                   }
-                  onSetDialogueStepDialogueId={
-                    updateProjectSequenceDialogueStepDialogueId
+                  onSetNpcTalkStepNpcEntityId={
+                    updateProjectSequenceNpcTalkStepNpcEntityId
+                  }
+                  onSetNpcTalkStepDialogueId={
+                    updateProjectSequenceNpcTalkStepDialogueId
                   }
                   onSetTeleportStepTarget={
                     updateProjectSequenceTeleportStepTarget
diff --git a/src/core/transform-session.ts b/src/core/transform-session.ts
index 67297898..dc9667b7 100644
--- a/src/core/transform-session.ts
+++ b/src/core/transform-session.ts
@@ -993,7 +993,10 @@ function createBrushTransformTarget(
       kind: "brush",
       brushId: brush.id,
       brushKind: brush.kind,
-      sideCount: brush.kind === "radialPrism" ? brush.sideCount : undefined,
+      sideCount:
+        brush.kind === "radialPrism" || brush.kind === "cone"
+          ? brush.sideCount
+          : undefined,
       majorSegmentCount:
         brush.kind === "torus" ? brush.majorSegmentCount : undefined,
       tubeSegmentCount: