diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 7229712a65..94f3cb7f1f 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -121,7 +121,7 @@
       {/if}
       {#if menuItems?.length > 0 && showMenu}
         <ActionMenu>
-          <div slot="control" class="icon">
+          <div slot="control" class="control icon">
             <Icon size="S" hoverable name="MoreSmallList" />
           </div>
           {#each menuItems as item}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
index dae6804e25..1fdbc98483 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_components/DynamicVariableModal.svelte
@@ -1,11 +1,10 @@
 <script>
   import { Input, ModalContent, Modal } from "@budibase/bbui"
 
-  export let datasource
   export let dynamicVariables
   export let binding
 
-  let name, modal
+  let name, modal, valid
 
   export const show = () => {
     modal.show()