diff --git a/src/plugins/revealAllSpoilers/index.ts b/src/plugins/revealAllSpoilers/index.ts
index ead746b2b..ad1d89f96 100644
--- a/src/plugins/revealAllSpoilers/index.ts
+++ b/src/plugins/revealAllSpoilers/index.ts
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Devs } from "@utils/constants";
+import { Devs, IS_MAC } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 
@@ -39,9 +39,9 @@ export default definePlugin({
     ],
 
     reveal(event: MouseEvent) {
-        const { ctrlKey, shiftKey, target } = event;
+        const { ctrlKey, metaKey, shiftKey, target } = event;
 
-        if (!ctrlKey) { return; }
+        if (!(IS_MAC ? metaKey : ctrlKey)) { return; }
 
         const { spoilerContent, hidden } = SpoilerClasses;
         const { messagesWrapper } = MessagesClasses;
diff --git a/src/plugins/showTimeoutDuration/index.tsx b/src/plugins/showTimeoutDuration/index.tsx
index 1bd68a0c3..6d13d9fc1 100644
--- a/src/plugins/showTimeoutDuration/index.tsx
+++ b/src/plugins/showTimeoutDuration/index.tsx
@@ -14,8 +14,8 @@ import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { Message } from "@vencord/discord-types";
 import { findComponentLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, Text, Tooltip } from "@webpack/common";
-import { FunctionComponent, ReactNode } from "react";
+import { ChannelStore, GuildMemberStore, Text, TooltipContainer } from "@webpack/common";
+import { ReactNode } from "react";
 
 const countDownFilter = canonicalizeMatch("#{intl::MAX_AGE_NEVER}");
 const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(countDownFilter));
@@ -83,13 +83,13 @@ export default definePlugin({
         }
     ],
 
-    TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: FunctionComponent<any>; text: ReactNode; }) => {
+    TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: ReactNode; text: ReactNode; }) => {
         if (settings.store.displayStyle === DisplayStyle.Tooltip)
-            return <Tooltip text={renderTimeout(message, false)}>{children}</Tooltip>;
+            return <TooltipContainer text={renderTimeout(message, false)}>{children}</TooltipContainer>;
 
         return (
             <div className="vc-std-wrapper">
-                <Tooltip text={text}>{children}</Tooltip>
+                <TooltipContainer text={text}>{children}</TooltipContainer>
                 <Text variant="text-md/normal" color="status-danger">
                     {renderTimeout(message, true)} timeout remaining
                 </Text>