diff --git a/core/src/components.d.ts b/core/src/components.d.ts
index bbbb5f31f7..6e42f590ec 100644
--- a/core/src/components.d.ts
+++ b/core/src/components.d.ts
@@ -62,7 +62,6 @@ import {
   RouteID,
   RouterDirection,
   RouterEventDetail,
-  RouterIntent,
   RouterOutletOptions,
   RouteWrite,
   SelectInputChangeEvent,
@@ -89,6 +88,9 @@ import {
 import {
   ViewController,
 } from './components/nav/view-controller';
+import {
+  RouterIntent,
+} from './components/router/utils/constants';
 import {
   ScrollBaseDetail,
   ScrollDetail,
diff --git a/core/src/utils/overlays.ts b/core/src/utils/overlays.ts
index 062f455a35..0cfd8dce30 100644
--- a/core/src/utils/overlays.ts
+++ b/core/src/utils/overlays.ts
@@ -10,7 +10,7 @@ export type Requires<K extends string> = {
   [P in K]: any;
 };
 
-export function createOverlay<T extends HTMLIonOverlayElement & Requires<keyof B>, B>
+export function createOverlay<T extends HTMLIonOverlayElement & Requires<any>, B>
 (element: T, opts: B): Promise<T | null> {
   // convert the passed in overlay options into props
   // that get passed down into the new overlay