diff --git a/docs/app/@core/data/data.module.ts b/docs/app/@core/data/data.module.ts
index 9e10e844..6d6f8b85 100644
--- a/docs/app/@core/data/data.module.ts
+++ b/docs/app/@core/data/data.module.ts
@@ -28,8 +28,8 @@ const SERVICES = [
   ],
 })
 export class DataModule {
-  static forRoot(): ModuleWithProviders {
-    return <ModuleWithProviders>{
+  static forRoot(): ModuleWithProviders<DataModule> {
+    return {
       ngModule: DataModule,
       providers: [
         ...SERVICES,
diff --git a/docs/index.html b/docs/index.html
index bf8c82d6..04d3b506 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -31,6 +31,17 @@
   'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
   })(window,document,'script','dataLayer','GTM-K8MXX5F');</script>
   <!-- End Google Tag Manager -->
+
+  <script>
+    (function(h,o,t,j,a,r){
+      h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+      h._hjSettings={hjid:1658218,hjsv:6};
+      a=o.getElementsByTagName('head')[0];
+      r=o.createElement('script');r.async=1;
+      r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+      a.appendChild(r);
+    })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+  </script>
 </head>
 <body>
   <!-- Google Tag Manager (noscript) -->
diff --git a/docs/tsconfig.app.json b/docs/tsconfig.app.json
index fb506e7e..3860a51f 100644
--- a/docs/tsconfig.app.json
+++ b/docs/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "baseUrl": "."
