diff --git a/src/components/navigation/left/ServerListSidebar.tsx b/src/components/navigation/left/ServerListSidebar.tsx
index 4d7c5381..23d2b869 100644
--- a/src/components/navigation/left/ServerListSidebar.tsx
+++ b/src/components/navigation/left/ServerListSidebar.tsx
@@ -30,14 +30,11 @@ export default observer(() => {
 
     return (
         <ServerList
-            // @ts-expect-error FIXME
             client={client}
             active={server_id}
             createServer={createServer}
-            // @ts-expect-error FIXME
             permit={state.notifications}
             home={state.layout.getLastHomePath}
-            // @ts-expect-error FIXME
             servers={state.ordering.orderedServers}
             reorder={state.ordering.reorderServer}
         />
diff --git a/src/context/intermediate/Intermediate.tsx b/src/context/intermediate/Intermediate.tsx
index 3cf59894..94d86408 100644
--- a/src/context/intermediate/Intermediate.tsx
+++ b/src/context/intermediate/Intermediate.tsx
@@ -5,7 +5,7 @@ import { API, Channel, Message, Server, User } from "revolt.js";
 import { createContext } from "preact";
 import { useContext, useEffect, useMemo, useState } from "preact/hooks";
 
-import type { Action } from "@revoltchat/ui/esm/components/design/atoms/layout/Modal";
+import type { Action } from "@revoltchat/ui/esm/components/design/atoms/display/Modal";
 
 import { internalSubscribe } from "../../lib/eventEmitter";
 import { determineLink } from "../../lib/links";
diff --git a/src/context/intermediate/modals/Prompt.tsx b/src/context/intermediate/modals/Prompt.tsx
index 9addc269..a01a9f8a 100644
--- a/src/context/intermediate/modals/Prompt.tsx
+++ b/src/context/intermediate/modals/Prompt.tsx
@@ -8,7 +8,7 @@ import { Text } from "preact-i18n";
 import { useContext, useEffect, useState } from "preact/hooks";
 
 import { Category, Modal, InputBox, Radio } from "@revoltchat/ui";
-import type { Action } from "@revoltchat/ui/esm/components/design/atoms/layout/Modal";
+import type { Action } from "@revoltchat/ui/esm/components/design/atoms/display/Modal";
 
 import { TextReact } from "../../../lib/i18n";
 
diff --git a/src/context/intermediate/popovers/ModifyAccount.tsx b/src/context/intermediate/popovers/ModifyAccount.tsx
index db47824f..e1da7573 100644
--- a/src/context/intermediate/popovers/ModifyAccount.tsx
+++ b/src/context/intermediate/popovers/ModifyAccount.tsx
@@ -73,7 +73,6 @@ export function ModifyAccountModal({ onClose, field }: Props) {
             disabled={processing}
             actions={[
                 {
-                    disabled: processing,
                     confirmation: true,
                     onClick: handleSubmit(onSubmit),
                     children: