diff --git a/apps/builder/app/builder/shared/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel.tsx
index 80a637a32843..9dc2b131174f 100644
--- a/apps/builder/app/builder/shared/floating-panel.tsx
+++ b/apps/builder/app/builder/shared/floating-panel.tsx
@@ -24,7 +24,7 @@ export const useSideOffset = ({
   side?: "left" | "right";
   isOpen: boolean;
   containerRef?: RefObject<null | HTMLElement>;
-}): [RefObject<HTMLButtonElement>, number] => {
+}): [RefObject<null | HTMLButtonElement>, number] => {
   const triggerRef = useRef<null | HTMLButtonElement>(null);
   const [sideOffset, setSideOffset] = useState(0);
 
diff --git a/apps/builder/app/canvas/features/build-mode/block.tsx b/apps/builder/app/canvas/features/build-mode/block.tsx
index 0cc1e137c88e..4d3397b84802 100644
--- a/apps/builder/app/canvas/features/build-mode/block.tsx
+++ b/apps/builder/app/canvas/features/build-mode/block.tsx
@@ -14,6 +14,7 @@ import {
   $isPreviewMode,
   $selectedInstanceSelector,
 } from "~/shared/nano-states";
+import type { InstanceSelector } from "~/shared/tree-utils";
 
 export const Block = React.forwardRef<
   HTMLDivElement,
@@ -61,8 +62,9 @@ export const Block = React.forwardRef<
         return (
           <div style={{ display: "contents" }} ref={ref} {...props}>
             {childArray.filter((child) => {
-              const { instanceSelector } = child.props;
-
+              const { instanceSelector } = child.props as {
+                instanceSelector: InstanceSelector;
+              };
               return instanceSelector[0] === templateInstanceId;
             })}
           </div>
diff --git a/packages/design-system/src/components/css-value-list-item.tsx b/packages/design-system/src/components/css-value-list-item.tsx
index 54728f82ca1c..428f3a622095 100644
--- a/packages/design-system/src/components/css-value-list-item.tsx
+++ b/packages/design-system/src/components/css-value-list-item.tsx
@@ -95,7 +95,7 @@ type Props = ComponentProps<typeof ItemButton> & {
   draggable?: boolean;
   label: React.ReactElement;
   thumbnail?: React.ReactElement;
-  buttons?: React.ReactElement;
+  buttons?: React.ReactElement<{ children: ReactNode }>;
   // to support Radix trigger asChild
   "data-state"?: "open";
   // for Storybook purposes