diff --git a/projects/testing-library/src/lib/models.ts b/projects/testing-library/src/lib/models.ts
index 9320fb6a..7799c3ce 100644
--- a/projects/testing-library/src/lib/models.ts
+++ b/projects/testing-library/src/lib/models.ts
@@ -20,7 +20,7 @@ export interface RenderResult<ComponentType, WrapperType = ComponentType> extend
    * element: The to be printed HTML element, if not provided it will log the whole component's DOM
    */
   debug: (
-    element?: Element | HTMLDocument | (Element | HTMLDocument)[],
+    element?: Element | Document | (Element | Document)[],
     maxLength?: number,
     options?: PrettyDOMOptions,
   ) => void;
diff --git a/projects/testing-library/src/lib/testing-library.ts b/projects/testing-library/src/lib/testing-library.ts
index 65877ef3..b1c8c16d 100644
--- a/projects/testing-library/src/lib/testing-library.ts
+++ b/projects/testing-library/src/lib/testing-library.ts
@@ -22,10 +22,9 @@ import {
   within as dtlWithin,
   waitForOptions as dtlWaitForOptions,
   configure as dtlConfigure,
-  Queries,
-  getQueriesForElement,
   queries as dtlQueries,
 } from '@testing-library/dom';
+import type { Queries, BoundFunctions } from '@testing-library/dom';
 import { RenderComponentOptions, RenderTemplateOptions, RenderResult } from './models';
 import { getConfig } from './config';
 
@@ -439,12 +438,11 @@ const screen = replaceFindWithFindAndDetectChanges(dtlScreen);
 /**
  * Re-export within with patched queries
  */
-
-const within: typeof getQueriesForElement = <T extends Queries = typeof dtlQueries>(
+const within = <QueriesToBind extends Queries = typeof dtlQueries, T extends QueriesToBind = QueriesToBind>(
   element: HTMLElement,
   queriesToBind?: T,
-) => {
-  const container = dtlWithin(element, queriesToBind);
+): BoundFunctions<T> => {
+  const container = dtlWithin<T>(element, queriesToBind);
   return replaceFindWithFindAndDetectChanges(container);
 };