diff --git a/packages/bbui/src/Tooltip/Context.svelte b/packages/bbui/src/Tooltip/Context.svelte
index 69f9af5a63..025abb5e65 100644
--- a/packages/bbui/src/Tooltip/Context.svelte
+++ b/packages/bbui/src/Tooltip/Context.svelte
@@ -7,7 +7,7 @@
   export let visible = false
   export let offset = 0;
 
-  $: target = getContext(Context.PopoverRoot) || ".spectrum"
+  $: target = getContext(Context.PopoverRoot) || "#app"
 
   let hovering = false
   let wrapper
@@ -39,10 +39,6 @@
       const previousStyles = window.getComputedStyle(previousTooltip?.firstChild)
       const currentStyles = window.getComputedStyle(currentTooltip?.firstChild)
 
-      console.log(previousStyles.backgroundColor);
-      console.log(currentStyles.backgroundColor);
-      console.log("")
-
       currentTooltipWidth = currentTooltip.clientWidth
       currentTooltipHeight = currentTooltip.clientHeight
 
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index 5f2bc6b214..f1478ad2bb 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -207,7 +207,7 @@
     <div class="contextTooltipContent">
       <div class="contextTooltipHeader">
         <Icon name={getOptionIcon(currentOption)} />
-        <span>{currentOption}</span>
+        <span>{getOptionIconTooltip(currentOption)}</span>
       </div>
 
       {#if fieldSupport[currentOption]?.errors?.length > 0}
@@ -231,7 +231,7 @@
     <div class="contextTooltipContent">
       <div class="contextTooltipHeader">
         <Icon name={getOptionIcon(previousOption)} />
-        <span>{previousOption}</span>
+        <span>{getOptionIconTooltip(previousOption)}</span>
       </div>
 
       {#if fieldSupport[previousOption]?.errors?.length > 0}
@@ -273,6 +273,8 @@
   }
 
   .contextTooltipHeader {
+    background-color: var(--background-alt);
+    color: var(--ink);
     display: flex;
     align-items: center;
     height: var(--spectrum-alias-item-height-m);
@@ -288,10 +290,10 @@
 
   .contextTooltipContent {
     padding: 0px 12px;
+    color: black;
   }
 
   .contextTooltipHeader :global(svg) {
-    color: var(--ink);
     margin-right: 5px;
   }
 
@@ -307,6 +309,7 @@
     height: var(--spectrum-alias-item-height-m);
     padding: 0px var(--spectrum-alias-item-padding-m);
     margin-bottom: 12px;
+    color: black;
   }
   .supportLevel :global(svg) {
     margin-right: 5px;
diff --git a/packages/builder/src/components/design/settings/fieldValidator.js b/packages/builder/src/components/design/settings/fieldValidator.js
index 43c3f33db9..86412462b3 100644
--- a/packages/builder/src/components/design/settings/fieldValidator.js
+++ b/packages/builder/src/components/design/settings/fieldValidator.js
@@ -31,7 +31,7 @@ export const validators = {
         response.warnings.push(
           "String columns can be used as input for a chart, but non-numeric values may cause unexpected behavior.")
       }
-      if (fieldSchema.type === "date") {
+      if (fieldSchema.type === "datetime") {
         response.warnings.push(
           "This column can be used as input for a chart, but it is parsed differently for various charts.")
       }