diff --git a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx
index 6eb49c9ceed..a9405f67ed3 100644
--- a/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx
+++ b/react-components/src/components/CogniteCadModelContainer/CogniteCadModelContainer.tsx
@@ -32,7 +32,7 @@ export default function CogniteCadModelContainer({
 
   return <></>;
 
-  async function addModel(modelId: number, revisionId: number, transform?: Matrix4) {
+  async function addModel(modelId: number, revisionId: number, transform?: Matrix4): Promise<void> {
     const cadModel = await viewer.addCadModel({ modelId, revisionId });
     if (transform !== undefined) {
       cadModel.setModelTransformation(transform);
diff --git a/react-components/src/components/Image360HistoricalDetails/Panel/index.ts b/react-components/src/components/Image360HistoricalDetails/Panel/index.ts
deleted file mode 100644
index 53ade3e0b35..00000000000
--- a/react-components/src/components/Image360HistoricalDetails/Panel/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Image360HistoricalPanel } from "./Image360HistoricalPanel";
diff --git a/react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx b/react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx
index 4354d035b54..060c05e11e3 100644
--- a/react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx
+++ b/react-components/src/components/Image360HistoricalDetails/Toolbar/Image360HistoricalSummary.tsx
@@ -6,7 +6,7 @@ import { Detail, Flex } from '@cognite/cogs.js';
 import React, { forwardRef, useEffect, useRef } from 'react';
 import styled from 'styled-components';
 import { Thumbnail } from '../utils/Thumbnail';
-import { Cognite3DViewer, Image360 } from '@cognite/reveal';
+import { type Cognite3DViewer, type Image360 } from '@cognite/reveal';
 // Using named import to avoid react component creation error when default import is used.
 import { uniqueId } from 'lodash';
 
@@ -40,13 +40,16 @@ export const Image360HistoricalSummary = forwardRef(
   ) => {
     const gridContainerRef = useRef<HTMLDivElement>(null);
 
-    const onRevisionChanged = (revisionDetails: Image360RevisionDetails, index: number) => {
-      if (viewer && revisionDetails.image360Entity) {
+    const onRevisionChanged = async (
+      revisionDetails: Image360RevisionDetails,
+      index: number
+    ): Promise<void> => {
+      if (viewer != null && revisionDetails.image360Entity != null) {
         setActiveRevision(index);
         const revisions = revisionDetails.image360Entity.getRevisions();
-        const revisionIndex = revisionDetails.index!;
+        const revisionIndex = revisionDetails.index;
         if (revisionIndex >= 0 && revisionIndex < revisions.length) {
-          viewer.enter360Image(revisionDetails.image360Entity, revisions[revisionIndex]);
+          await viewer.enter360Image(revisionDetails.image360Entity, revisions[revisionIndex]);
         }
       }
     };
@@ -55,15 +58,15 @@ export const Image360HistoricalSummary = forwardRef(
       return (ref as React.MutableRefObject<T>).current !== undefined;
     }
 
-    function onScroll(e: React.UIEvent<HTMLDivElement, UIEvent>) {
+    function onScroll(e: React.UIEvent<HTMLDivElement, UIEvent>): void {
       if (isMutableRefObject(ref)) {
         ref.current = e.currentTarget.scrollLeft;
       }
     }
 
     useEffect(() => {
-      if (gridContainerRef.current && isMutableRefObject(ref)) {
-        gridContainerRef.current.scrollLeft = ref.current!;
+      if (gridContainerRef.current != null && isMutableRefObject(ref)) {
+        gridContainerRef.current.scrollLeft = ref.current;
       }
     }, []);
 
@@ -79,7 +82,9 @@ export const Image360HistoricalSummary = forwardRef(
             {revisionCollection.map((revisionDetails, index) => (
               <RevisionItem
                 key={uniqueId()}
-                onClick={onRevisionChanged.bind(null, revisionDetails, index)}>
+                onClick={() => {
+                  void onRevisionChanged(revisionDetails, index);
+                }}>
                 <Thumbnail
                   key={index}
                   isActive={activeRevision === index}
@@ -96,6 +101,8 @@ export const Image360HistoricalSummary = forwardRef(
   }
 );
 
+Image360HistoricalSummary.displayName = 'Image360HistoricalSummary';
+
 const StyledSubFlex = styled(Flex)`
   align-items: flex-start;
   margin-bottom: 10px;
diff --git a/react-components/src/components/Image360HistoricalDetails/Toolbar/index.ts b/react-components/src/components/Image360HistoricalDetails/Toolbar/index.ts
deleted file mode 100644
index 7889ffcd72f..00000000000
--- a/react-components/src/components/Image360HistoricalDetails/Toolbar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Image360HistoricalSummary } from './Image360HistoricalSummary';
diff --git a/react-components/tsconfig.json b/react-components/tsconfig.json
index 10cafab292a..8cb3e155679 100644
--- a/react-components/tsconfig.json
+++ b/react-components/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "target": "ES6",
-    "baseUrl": "./src",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": false,
@@ -15,5 +14,5 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true
   },
-  "include": ["src/*"]
+  "include": ["src/*", "stories/*"]
 }
diff --git a/react-components/webpack.config.js b/react-components/webpack.config.js
index 80f5a2ade2f..57826127587 100644
--- a/react-components/webpack.config.js
+++ b/react-components/webpack.config.js
@@ -22,7 +22,10 @@ export default (_, argv) => {
         {
           test: /\.tsx?$/,
           loader: 'ts-loader',
-          exclude: /node_modules/
+          exclude: /node_modules/,
+          options: {
+            onlyCompileBundledFiles: true
+          }
         },
         {
           test: /\.css$/i,