diff --git a/webapp/package.json b/webapp/package.json
index c8f2657..974771a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -76,6 +76,9 @@
     "redux": "4.0.5",
     "typescript": "4.2.4"
   },
+  "resolutions": {
+    "@types/react": "17.0.3"
+  },
   "jest": {
     "snapshotSerializers": [
       "<rootDir>/node_modules/enzyme-to-json/serializer"
diff --git a/webapp/src/components/rhs/all_badges_row.tsx b/webapp/src/components/rhs/all_badges_row.tsx
index a8d56bc..9c25719 100644
--- a/webapp/src/components/rhs/all_badges_row.tsx
+++ b/webapp/src/components/rhs/all_badges_row.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
 import {AllBadgesBadge} from '../../types/badges';
-import BadgeImage from '../utils/badge_image';
+import BadgeImage from '../badge_image/badge_image';
 import {markdown} from 'utils/markdown';
 
 import './all_badges_row.scss';
diff --git a/webapp/src/components/rhs/rhs_scrollbars.tsx b/webapp/src/components/rhs/rhs_scrollbars.tsx
index f393bd9..1db87b1 100644
--- a/webapp/src/components/rhs/rhs_scrollbars.tsx
+++ b/webapp/src/components/rhs/rhs_scrollbars.tsx
@@ -26,7 +26,7 @@ function renderThumbVertical(props: any) {
         />);
 }
 
-const RHSScrollbars = ({children}: {children: React.ReactNode[]}) => {
+const RHSScrollbars = ({children}: {children: React.ReactNode}) => {
     return (
         <Scrollbars
             autoHide={true}
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index e38319c..ec1498e 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2605,25 +2605,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*":
-  version: 19.2.14
-  resolution: "@types/react@npm:19.2.14"
-  dependencies:
-    csstype: "npm:^3.2.2"
-  checksum: 10c0/7d25bf41b57719452d86d2ac0570b659210402707313a36ee612666bf11275a1c69824f8c3ee1fdca077ccfe15452f6da8f1224529b917050eb2d861e52b59b7
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:16 || 17 || 18":
-  version: 18.3.28
-  resolution: "@types/react@npm:18.3.28"
-  dependencies:
-    "@types/prop-types": "npm:*"
-    csstype: "npm:^3.2.2"
-  checksum: 10c0/683e19cd12b5c691215529af2e32b5ffbaccae3bf0ba93bfafa0e460e8dfee18423afed568be2b8eadf4b837c3749dd296a4f64e2d79f68fa66962c05f5af661
-  languageName: node
-  linkType: hard
-
 "@types/react@npm:17.0.3":
   version: 17.0.3
   resolution: "@types/react@npm:17.0.3"
@@ -4533,7 +4514,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.0.2, csstype@npm:^3.2.2":
+"csstype@npm:^3.0.2":
   version: 3.2.3
   resolution: "csstype@npm:3.2.3"
   checksum: 10c0/cd29c51e70fa822f1cecd8641a1445bed7063697469d35633b516e60fe8c1bde04b08f6c5b6022136bb669b64c63d4173af54864510fbb4ee23281801841a3ce