diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
index 2630a495..573672cc 100644
--- a/.github/workflows/e2e_tests.yml
+++ b/.github/workflows/e2e_tests.yml
@@ -21,8 +21,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
+        id: setup_node
         with:
-          node-version: 18
+          node-version-file: package.json
+          cache: npm
 
       # Cache Playwright browsers
       - name: Cache Playwright browsers
@@ -69,7 +71,7 @@ jobs:
           job-summary: true
           icon-style: "emojis"
           custom-info: |
-            **Test Environment:** Ubuntu Latest, Node.js 18
+            **Test Environment:** Ubuntu Latest, Node.js ${{ steps.setup_node.outputs.node-version }}
             **Browsers:** Chromium, Firefox
 
             📊 [View Detailed HTML Report](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) (download artifacts)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 65e98fa4..d01f7175 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: package.json
           cache: npm
 
       # Working around https://github.com/npm/cli/issues/4828
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version-file: package.json
           cache: npm
           registry-url: "https://registry.npmjs.org"
 
diff --git a/.node-version b/.node-version
new file mode 100644
index 00000000..980f29c2
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+22.x.x
diff --git a/client/index.html b/client/index.html
index 00f5600b..b3736a82 100644
--- a/client/index.html
+++ b/client/index.html
@@ -7,7 +7,7 @@
     <title>MCP Inspector</title>
   </head>
   <body>
-    <div id="root"></div>
+    <div id="root" class="w-full"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>
diff --git a/client/src/App.css b/client/src/App.css
index 5f47310f..0d669ffa 100644
--- a/client/src/App.css
+++ b/client/src/App.css
@@ -1,7 +1,3 @@
-#root {
-  margin: 0 auto;
-}
-
 .logo {
   height: 6em;
   padding: 1.5em;
diff --git a/client/src/utils/configUtils.ts b/client/src/utils/configUtils.ts
index 85319497..418f0007 100644
--- a/client/src/utils/configUtils.ts
+++ b/client/src/utils/configUtils.ts
@@ -14,8 +14,9 @@ const getSearchParam = (key: string): string | null => {
 };
 
 export const getMCPProxyAddress = (config: InspectorConfig): string => {
-  const proxyFullAddress = config.MCP_PROXY_FULL_ADDRESS.value as string;
+  let proxyFullAddress = config.MCP_PROXY_FULL_ADDRESS.value as string;
   if (proxyFullAddress) {
+    proxyFullAddress = proxyFullAddress.replace(/\/+$/, "");
     return proxyFullAddress;
   }
 
diff --git a/package-lock.json b/package-lock.json
index ce3b7ba7..075b0a28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,9 @@
         "prettier": "3.3.3",
         "rimraf": "^6.0.1",
         "typescript": "^5.4.2"
+      },
+      "engines": {
+        "node": ">=22.7.5"
       }
     },
     "cli": {
diff --git a/package.json b/package.json
index de02890d..5d5fe52f 100644
--- a/package.json
+++ b/package.json
@@ -64,5 +64,8 @@
     "prettier": "3.3.3",
     "rimraf": "^6.0.1",
     "typescript": "^5.4.2"
+  },
+  "engines": {
+    "node": ">=22.7.5"
   }
 }
diff --git a/server/src/mcpProxy.ts b/server/src/mcpProxy.ts
index 9dee9de4..664f1711 100644
--- a/server/src/mcpProxy.ts
+++ b/server/src/mcpProxy.ts
@@ -6,12 +6,10 @@ function onClientError(error: Error) {
 }
 
 function onServerError(error: Error) {
-  if (
-    (error?.message &&
-      error.message.includes("Error POSTing to endpoint (HTTP 404)")) ||
-    (error?.cause && JSON.stringify(error.cause).includes("ECONNREFUSED"))
-  ) {
+  if (error?.cause && JSON.stringify(error.cause).includes("ECONNREFUSED")) {
     console.error("Connection refused. Is the MCP server running?");
+  } else if (error.message && error.message.includes("404")) {
+    console.error("Error accessing endpoint (HTTP 404)");
   } else {
     console.error("Error from MCP server:", error);
   }