diff --git a/change/@fluentui-react-85b5d646-9bf4-47d7-bfe5-8d0d382f79f7.json b/change/@fluentui-react-85b5d646-9bf4-47d7-bfe5-8d0d382f79f7.json
new file mode 100644
index 00000000000000..9454f088282402
--- /dev/null
+++ b/change/@fluentui-react-85b5d646-9bf4-47d7-bfe5-8d0d382f79f7.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Add parameter to ComboBox internal method to avoid cast",
+  "packageName": "@fluentui/react",
+  "email": "elcraig@microsoft.com",
+  "dependentChangeType": "none"
+}
diff --git a/package.json b/package.json
index 0eb0e3e37359be..457a0e5a8409bc 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "vrtest": "cd apps && cd vr-tests && yarn screener"
   },
   "devDependencies": {
+    "@microsoft/api-extractor": "7.13.0",
     "@storybook/addon-a11y": "6.0.28",
     "@storybook/addon-actions": "6.0.28",
     "@storybook/addon-info": "6.0.0-alpha.2",
@@ -150,17 +151,14 @@
       "@fluentui/make-styles/stylis",
       "@fluentui/react-bindings/stylis",
       "@fluentui/react-northstar-fela-renderer/stylis",
-      "@fluentui/web-components/**/typescript",
       "@fluentui/web-components/@microsoft/eslint-config-fast-dna",
       "@fluentui/web-components/@storybook/**",
-      "@fluentui/web-components/build",
-      "@fluentui/web-components/build/**",
       "@fluentui/web-components/ts-loader",
       "@fluentui/web-components/ts-loader/**",
       "@fluentui/web-components/ts-node",
       "@fluentui/web-components/ts-node/**",
       "@fluentui/web-components/typescript",
-      "@fluentui/web-components/typescript/**",
+      "@fluentui/web-components/**/typescript",
       "@fluentui/web-components/webpack"
     ]
   },
@@ -184,14 +182,6 @@
       "scripts/package.json"
     ],
     "versionGroups": [
-      {
-        "packages": [
-          "test-bundles"
-        ],
-        "dependencies": [
-          "webpack"
-        ]
-      },
       {
         "packages": [
           "@fluentui/web-components"
diff --git a/packages/react/src/components/ComboBox/ComboBox.tsx b/packages/react/src/components/ComboBox/ComboBox.tsx
index 1f14b070a4d123..44b1f8ddbdd6ea 100644
--- a/packages/react/src/components/ComboBox/ComboBox.tsx
+++ b/packages/react/src/components/ComboBox/ComboBox.tsx
@@ -19,6 +19,7 @@ import {
   Async,
   EventGroup,
   getPropsWithDefaults,
+  IRenderFunction,
 } from '../../Utilities';
 import { Callout, DirectionalHint } from '../../Callout';
 import { Checkbox } from '../../Checkbox';
@@ -445,8 +446,7 @@ class ComboBoxInternal extends React.Component<IComboBoxInternalProps, IComboBox
         {onRenderLabel({ props: this.props, multiselectAccessibleText }, this._onRenderLabel)}
         {comboBoxWrapper}
         {(persistMenu || isOpen) &&
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (onRenderContainer as any)(
+          onRenderContainer(
             {
               ...this.props,
               onRenderList,
@@ -1204,7 +1204,7 @@ class ComboBoxInternal extends React.Component<IComboBoxInternalProps, IComboBox
   }
 
   // Render Callout container and pass in list
-  private _onRenderContainer = (props: IComboBoxProps): JSX.Element => {
+  private _onRenderContainer = (props: IComboBoxProps, defaultRender: IRenderFunction<IComboBoxProps>): JSX.Element => {
     const {
       onRenderList,
       calloutProps,
diff --git a/scripts/package.json b/scripts/package.json
index 0b1b23f8d653f1..2233a6e3fc3602 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -27,7 +27,6 @@
     "@babel/standalone": "^7.10.4",
     "@fluentui/eslint-plugin": "^1.2.0",
     "@mdx-js/loader": "^1.5.5",
-    "@microsoft/api-extractor": "7.13.0",
     "@microsoft/load-themed-styles": "^1.10.26",
     "@microsoft/loader-load-themed-styles": "^1.7.205",
     "@octokit/rest": "^16.28.2",
diff --git a/scripts/scrub.js b/scripts/scrub.js
index d1d46e3fb49967..b9c461a2027e8e 100644
--- a/scripts/scrub.js
+++ b/scripts/scrub.js
@@ -122,7 +122,11 @@ async function run() {
 
   // do these before deleting node_nodules
   console.log('\nClearing Jest cache...');
-  spawn(os.platform() === 'win32' ? 'npx.cmd' : 'npx', ['jest', '--clearCache']);
+  try {
+    spawn(os.platform() === 'win32' ? 'npx.cmd' : 'npx', ['jest', '--clearCache']);
+  } catch (err) {
+    console.error('Clearing jest cache failed, likely due to it or a dep not being installed.');
+  }
   try {
     console.log('\nAttempting to clear gulp-cache...');
     const cache = require('gulp-cache');