diff --git a/apps/web/src/web-container.ts b/apps/web/src/web-container.ts
index 3075d139ce..cf17cd493e 100644
--- a/apps/web/src/web-container.ts
+++ b/apps/web/src/web-container.ts
@@ -27,8 +27,8 @@ import {
 } from "@posthog/core/auth/identifiers";
 import { canvasCoreModule } from "@posthog/core/canvas/canvas.module";
 import { taskThreadCoreModule } from "@posthog/core/canvas/taskThread.module";
-import type { CloudTaskService } from "@posthog/core/cloud-task/cloud-task";
 import { cloudTaskModule } from "@posthog/core/cloud-task/cloud-task.module";
+import type { CloudTaskService } from "@posthog/core/cloud-task/cloud-task-engine";
 import {
   CLOUD_TASK_AUTH,
   CLOUD_TASK_SERVICE,
diff --git a/packages/core/src/cloud-task/cloud-task.ts b/packages/core/src/cloud-task/cloud-task-engine.ts
similarity index 100%
rename from packages/core/src/cloud-task/cloud-task.ts
rename to packages/core/src/cloud-task/cloud-task-engine.ts
diff --git a/packages/core/src/cloud-task/cloud-task.module.ts b/packages/core/src/cloud-task/cloud-task.module.ts
index 02f0cc91db..464011d14f 100644
--- a/packages/core/src/cloud-task/cloud-task.module.ts
+++ b/packages/core/src/cloud-task/cloud-task.module.ts
@@ -1,5 +1,5 @@
 import { ContainerModule } from "inversify";
-import { CloudTaskService } from "./cloud-task";
+import { CloudTaskService } from "./cloud-task-engine";
 import { CLOUD_TASK_SERVICE } from "./identifiers";
 
 export const cloudTaskModule = new ContainerModule(({ bind }) => {
diff --git a/packages/core/src/cloud-task/cloud-task.test.ts b/packages/core/src/cloud-task/cloud-task.test.ts
index a7fbf37c66..9002f948ff 100644
--- a/packages/core/src/cloud-task/cloud-task.test.ts
+++ b/packages/core/src/cloud-task/cloud-task.test.ts
@@ -22,7 +22,7 @@ const fetchRouter = vi.hoisted(() =>
   }),
 );
 
-import { CloudTaskService } from "./cloud-task";
+import { CloudTaskService } from "./cloud-task-engine";
 
 const mockAuthService = {
   authenticatedFetch: vi.fn(),
diff --git a/packages/core/src/handoff/handoff.ts b/packages/core/src/handoff/handoff.ts
index c85c2fcfa8..2b8d477099 100644
--- a/packages/core/src/handoff/handoff.ts
+++ b/packages/core/src/handoff/handoff.ts
@@ -5,7 +5,7 @@ import {
   TypedEventEmitter,
 } from "@posthog/shared";
 import { inject, injectable } from "inversify";
-import type { CloudTaskService } from "../cloud-task/cloud-task";
+import type { CloudTaskService } from "../cloud-task/cloud-task-engine";
 import { CLOUD_TASK_SERVICE } from "../cloud-task/identifiers";
 import { HandoffSaga, type HandoffSagaDeps } from "./handoff-saga";
 import {
diff --git a/packages/host-router/src/routers/cloud-task.router.ts b/packages/host-router/src/routers/cloud-task.router.ts
index 15d577ce59..4546995404 100644
--- a/packages/host-router/src/routers/cloud-task.router.ts
+++ b/packages/host-router/src/routers/cloud-task.router.ts
@@ -1,4 +1,4 @@
-import type { CloudTaskService } from "@posthog/core/cloud-task/cloud-task";
+import type { CloudTaskService } from "@posthog/core/cloud-task/cloud-task-engine";
 import { CLOUD_TASK_SERVICE } from "@posthog/core/cloud-task/identifiers";
 import {
   CloudTaskEvent,
diff --git a/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts b/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
index 2d891f42be..23a0e28ffa 100644
--- a/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
+++ b/packages/ui/src/features/canvas/hooks/useChannelsLayout.ts
@@ -10,6 +10,9 @@ export function useChannelsLayout(): boolean {
     PROJECT_BLUEBIRD_FLAG,
     import.meta.env.DEV,
   );
-  const layoutEnabled = useFeatureFlag(CHANNELS_LAYOUT_FLAG, false);
+  const layoutEnabled = useFeatureFlag(
+    CHANNELS_LAYOUT_FLAG,
+    import.meta.env.DEV,
+  );
   return layoutEnabled && bluebirdEnabled;
 }
diff --git a/packages/ui/src/features/command/CommandSearchBar.tsx b/packages/ui/src/features/command/CommandSearchBar.tsx
index 9b905e4b62..5906f830e6 100644
--- a/packages/ui/src/features/command/CommandSearchBar.tsx
+++ b/packages/ui/src/features/command/CommandSearchBar.tsx
@@ -18,12 +18,12 @@ export function CommandSearchBar({ onClick }: { onClick: () => void }) {
   return (
     // The row is a window-drag region; the field has to opt out of it or the
     // press that should open the menu drags the window instead.
-    <div className="no-drag mt-px min-w-0 flex-1 px-3">
+    <div className="mt-px min-w-0 flex-1 px-3">
       <button
         type="button"
         aria-label="Search"
         onClick={onClick}
-        className="mx-auto flex h-7 w-full max-w-120 items-center gap-2 rounded-sm bg-fill-hover pr-1 pl-2 hover:bg-fill-selected dark:hover:bg-input/80"
+        className="no-drag mx-auto flex h-7 w-full max-w-120 items-center gap-2 rounded-sm bg-fill-hover pr-1 pl-2 hover:bg-fill-selected dark:hover:bg-input/80"
       >
         <MagnifyingGlass size={14} className="shrink-0" />
         <span className="min-w-0 flex-1 truncate text-left text-[13px]">