diff --git a/app/components/home.tsx b/app/components/home.tsx
index 68853e743..b3cec893e 100644
--- a/app/components/home.tsx
+++ b/app/components/home.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-// require("../polyfill");
+require("../polyfill");
 
 import { useState, useEffect } from "react";
 
diff --git a/app/components/mask.tsx b/app/components/mask.tsx
index 0006793cb..b90722134 100644
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -215,7 +215,7 @@ function ContextPromptItem(props: {
   const [focusingInput, setFocusingInput] = useState(false);
 
   return (
-    <Draggable draggableId={props.prompt.id.toString()} index={props.index}>
+    <Draggable draggableId={props.prompt.id || props.index.toString()} index={props.index}>
       {(provided) => (
         <div
           className={chatStyle["context-prompt-row"]}
diff --git a/app/layout.tsx b/app/layout.tsx
index 4977afa17..883a268d3 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -3,8 +3,9 @@ import "./styles/globals.scss";
 import "./styles/markdown.scss";
 import "./styles/highlight.scss";
 import { getClientConfig } from "./config/client";
+import { type Metadata } from 'next';
 
-export const metadata = {
+export const metadata: Metadata = {
   title: "ChatGPT Next Web",
   description: "Your personal ChatGPT Chat Bot.",
   viewport: {