diff --git a/projects/ng-devtools-backend/src/lib/component-tree.ts b/projects/ng-devtools-backend/src/lib/component-tree.ts
index 43ab7035727..65df2e79dbd 100644
--- a/projects/ng-devtools-backend/src/lib/component-tree.ts
+++ b/projects/ng-devtools-backend/src/lib/component-tree.ts
@@ -24,6 +24,11 @@ export interface ComponentTreeNode extends Node<DirectiveInstanceType, Component
   children: ComponentTreeNode[];
 }
 
+export interface DirectiveForestBuilderOptions {
+  getDirectives?: boolean;
+  includeNativeElement?: boolean;
+}
+
 export const getLatestComponentState = (query: ComponentExplorerViewQuery): DirectivesProperties | undefined => {
   let result;
   if (query.selectedElement && query.expandedProperties) {
@@ -86,7 +91,7 @@ export const getComponentForest = (root = document.documentElement): ComponentTr
 const buildDirectiveForest = (
   node: Element,
   tree: ComponentTreeNode | undefined,
-  options: { [option: string]: boolean } = {}
+  options: DirectiveForestBuilderOptions = {}
 ): ComponentTreeNode[] => {
   if (!node) {
     return [tree];
diff --git a/projects/ng-devtools-backend/src/lib/utils.ts b/projects/ng-devtools-backend/src/lib/utils.ts
index 8818583e380..9431ae11338 100644
--- a/projects/ng-devtools-backend/src/lib/utils.ts
+++ b/projects/ng-devtools-backend/src/lib/utils.ts
@@ -12,8 +12,8 @@ export const patchTemplate = (instance: any, fn: () => void) => {
   const metadata = componentMetadata(instance);
   const original = metadata.template;
 
-  metadata.tView.template = metadata.template = (...args) => {
-    const result = original(...args);
+  metadata.tView.template = metadata.template = function() {
+    const result = original.apply(this, arguments);
     fn();
     return result;
   };