diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx
index 55760bb818d..875ff7d6bd4 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-connector-modal/add-connector-modal.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useMemo, useState } from 'react'
-import { ArrowLeft, ArrowLeftRight, Plus, Search } from 'lucide-react'
+import { ArrowLeft, ArrowLeftRight, Info, Plus, Search } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import {
   Button,
@@ -347,12 +347,28 @@ export function AddConnectorModal({
                   return (
                     <div key={field.id} className='flex flex-col gap-2'>
                       <div className='flex items-center justify-between'>
-                        <Label>
-                          {field.title}
-                          {field.required && (
-                            <span className='ml-0.5 text-[var(--text-error)]'>*</span>
+                        <div className='flex items-center gap-1'>
+                          <Label>
+                            {field.title}
+                            {field.required && (
+                              <span className='ml-0.5 text-[var(--text-error)]'>*</span>
+                            )}
+                          </Label>
+                          {field.description && (
+                            <Tooltip.Root>
+                              <Tooltip.Trigger asChild>
+                                <button
+                                  type='button'
+                                  className='flex size-[14px] cursor-help items-center justify-center text-[var(--text-muted)] transition-colors hover-hover:text-[var(--text-secondary)]'
+                                  aria-label={`About ${field.title}`}
+                                >
+                                  <Info className='size-[12px]' />
+                                </button>
+                              </Tooltip.Trigger>
+                              <Tooltip.Content side='top'>{field.description}</Tooltip.Content>
+                            </Tooltip.Root>
                           )}
-                        </Label>
+                        </div>
                         {hasCanonicalPair && canonicalId && (
                           <Tooltip.Root>
                             <Tooltip.Trigger asChild>
@@ -372,9 +388,6 @@ export function AddConnectorModal({
                           </Tooltip.Root>
                         )}
                       </div>
-                      {field.description && (
-                        <p className='text-[var(--text-muted)] text-xs'>{field.description}</p>
-                      )}
                       {field.type === 'selector' && field.selectorKey ? (
                         <ConnectorSelectorField
                           field={field as ConnectorConfigField & { selectorKey: SelectorKey }}
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx
index a15578145f5..7e2761bbdd2 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/edit-connector-modal/edit-connector-modal.tsx
@@ -2,7 +2,7 @@
 
 import { useMemo, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { ArrowLeftRight, ExternalLink, RotateCcw } from 'lucide-react'
+import { ArrowLeftRight, ExternalLink, Info, RotateCcw } from 'lucide-react'
 import {
   Button,
   ButtonGroup,
@@ -385,10 +385,26 @@ function SettingsTab({
         return (
           <div key={field.id} className='flex flex-col gap-2'>
             <div className='flex items-center justify-between'>
-              <Label>
-                {field.title}
-                {field.required && <span className='ml-0.5 text-[var(--text-error)]'>*</span>}
-              </Label>
+              <div className='flex items-center gap-1'>
+                <Label>
+                  {field.title}
+                  {field.required && <span className='ml-0.5 text-[var(--text-error)]'>*</span>}
+                </Label>
+                {field.description && (
+                  <Tooltip.Root>
+                    <Tooltip.Trigger asChild>
+                      <button
+                        type='button'
+                        className='flex size-[14px] cursor-help items-center justify-center text-[var(--text-muted)] transition-colors hover-hover:text-[var(--text-secondary)]'
+                        aria-label={`About ${field.title}`}
+                      >
+                        <Info className='size-[12px]' />
+                      </button>
+                    </Tooltip.Trigger>
+                    <Tooltip.Content side='top'>{field.description}</Tooltip.Content>
+                  </Tooltip.Root>
+                )}
+              </div>
               {hasCanonicalPair && canonicalId && (
                 <Tooltip.Root>
                   <Tooltip.Trigger asChild>
@@ -406,9 +422,6 @@ function SettingsTab({
                 </Tooltip.Root>
               )}
             </div>
-            {field.description && (
-              <p className='text-[var(--text-muted)] text-xs'>{field.description}</p>
-            )}
             {field.type === 'selector' && field.selectorKey ? (
               <ConnectorSelectorField
                 field={field as ConnectorConfigField & { selectorKey: SelectorKey }}
diff --git a/apps/sim/components/emcn/components/combobox/combobox.tsx b/apps/sim/components/emcn/components/combobox/combobox.tsx
index f423f7fa939..5172d5db337 100644
--- a/apps/sim/components/emcn/components/combobox/combobox.tsx
+++ b/apps/sim/components/emcn/components/combobox/combobox.tsx
@@ -214,6 +214,22 @@ const Combobox = memo(
         [allOptions, effectiveSelectedValue]
       )
 
+      /**
+       * Label rendered in the collapsed trigger for multi-select mode.
+       * Shows the single label when one value is picked, comma-joined labels
+       * for two, or "first, second +N" when more are selected. Falls back to
+       * the raw value if an option for it hasn't loaded yet.
+       */
+      const multiSelectLabel = useMemo(() => {
+        if (!multiSelect || !multiSelectValues || multiSelectValues.length === 0) return null
+        const labelFor = (v: string) => allOptions.find((opt) => opt.value === v)?.label ?? v
+        if (multiSelectValues.length === 1) return labelFor(multiSelectValues[0])
+        if (multiSelectValues.length === 2) {
+          return `${labelFor(multiSelectValues[0])}, ${labelFor(multiSelectValues[1])}`
+        }
+        return `${labelFor(multiSelectValues[0])}, ${labelFor(multiSelectValues[1])} +${multiSelectValues.length - 2}`
+      }, [multiSelect, multiSelectValues, allOptions])
+
       /**
        * Filter options based on current value or search query
        */
@@ -590,11 +606,11 @@ const Combobox = memo(
                     <span
                       className={cn(
                         'flex-1 truncate',
-                        !selectedOption && 'text-[var(--text-muted)]',
+                        !selectedOption && !multiSelectLabel && 'text-[var(--text-muted)]',
                         overlayContent && 'text-transparent'
                       )}
                     >
-                      {selectedOption ? selectedOption.label : placeholder}
+                      {multiSelectLabel ?? (selectedOption ? selectedOption.label : placeholder)}
                     </span>
                     <ChevronDown
                       className={cn(
diff --git a/apps/sim/lib/concurrency/__tests__/leader-lock.test.ts b/apps/sim/lib/concurrency/__tests__/leader-lock.test.ts
index 8b3e2a3a06b..bd0a11c548b 100644
--- a/apps/sim/lib/concurrency/__tests__/leader-lock.test.ts
+++ b/apps/sim/lib/concurrency/__tests__/leader-lock.test.ts
@@ -120,39 +120,62 @@ describe('withLeaderLock', () => {
   it('follower does a final read after timeout to catch a just-finished leader', async () => {
     redisConfigMockFns.mockAcquireLock.mockResolvedValueOnce(false)
 
-    // pollInterval=5, maxWait=9 → loop exits after 2 in-loop polls (T+5, T+10);
-    // the third call (polls=3) is the post-deadline last-chance read.
-    let polls = 0
-    const onFollower = vi.fn(async () => {
-      polls += 1
-      if (polls <= 2) return null
-      return 'late-leader'
-    })
+    /**
+     * The intent: after the in-loop poll deadline is reached, the follower
+     * does exactly one more (last-chance) `onFollower` call to catch a leader
+     * that finished between the previous poll and the timeout. Using fake
+     * timers makes the timing deterministic — pollInterval=10 and maxWait=15
+     * cause two in-loop polls (T+10, T+20) and one last-chance read (T+20),
+     * but the schedule is driven by mocked time, not the CI wall clock.
+     */
+    vi.useFakeTimers()
+    try {
+      let polls = 0
+      const onFollower = vi.fn(async () => {
+        polls += 1
+        if (polls <= 2) return null
+        return 'late-leader'
+      })
 
-    const result = await withLeaderLock<string>({
-      key: 'k',
-      pollIntervalMs: 5,
-      maxWaitMs: 9,
-      onLeader: async () => 'should-not-run',
-      onFollower,
-    })
+      const promise = withLeaderLock<string>({
+        key: 'k',
+        pollIntervalMs: 10,
+        maxWaitMs: 15,
+        onLeader: async () => 'should-not-run',
+        onFollower,
+      })
+
+      await vi.advanceTimersByTimeAsync(30)
+      const result = await promise
 
-    expect(result).toBe('late-leader')
-    expect(onFollower).toHaveBeenCalledTimes(3)
+      expect(result).toBe('late-leader')
+      expect(onFollower).toHaveBeenCalledTimes(3)
+    } finally {
+      vi.useRealTimers()
+    }
   })
 
   it('follower returns null after timeout', async () => {
     redisConfigMockFns.mockAcquireLock.mockResolvedValueOnce(false)
 
-    const result = await withLeaderLock<string>({
-      key: 'k',
-      pollIntervalMs: 5,
-      maxWaitMs: 20,
-      onLeader: async () => 'should-not-run',
-      onFollower: async () => null,
-    })
+    vi.useFakeTimers()
+    try {
+      const onFollower = vi.fn(async () => null)
+      const promise = withLeaderLock<string>({
+        key: 'k',
+        pollIntervalMs: 10,
+        maxWaitMs: 25,
+        onLeader: async () => 'should-not-run',
+        onFollower,
+      })
+
+      await vi.advanceTimersByTimeAsync(50)
+      const result = await promise
 
-    expect(result).toBeNull()
+      expect(result).toBeNull()
+    } finally {
+      vi.useRealTimers()
+    }
   })
 
   it('only one of N concurrent callers acquires the lock', async () => {