diff --git a/src/handlers/messages/MESSAGE_CREATE.ts b/src/handlers/messages/MESSAGE_CREATE.ts
index 8b1a85a7c..8fe8e4687 100644
--- a/src/handlers/messages/MESSAGE_CREATE.ts
+++ b/src/handlers/messages/MESSAGE_CREATE.ts
@@ -10,7 +10,7 @@ import { DiscordMessage, Message } from "../../types/messages/message.ts";
 import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 export async function handleMessageCreate(data: DiscordGatewayPayload) {
-  const payload: Message = snakeKeysToCamelCase(data.d as DiscordMessage);
+  const payload = snakeKeysToCamelCase(data.d as DiscordMessage) as Message;
   const channel = await cacheHandlers.get("channels", payload.channelId);
   if (channel) channel.lastMessageId = payload.id;
 
@@ -37,7 +37,7 @@ export async function handleMessageCreate(data: DiscordGatewayPayload) {
 
       return cacheHandlers.set(
         "members",
-        discordenoMember.id,
+        mention.id,
         discordenoMember,
       );
     }
diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts
index a849b4653..45d2327dd 100644
--- a/src/helpers/members/edit_member.ts
+++ b/src/helpers/members/edit_member.ts
@@ -9,6 +9,7 @@ import {
   requireBotChannelPermissions,
   requireBotGuildPermissions,
 } from "../../util/permissions.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Edit the member */
 export async function editMember(
@@ -72,7 +73,7 @@ export async function editMember(
     endpoints.GUILD_MEMBER(guildId, memberId),
     options,
   ) as DiscordGuildMember;
-  const member = await structures.createDiscordenoMember(result, guildId);
+  const member = await structures.createDiscordenoMember(snakeKeysToCamelCase(result), guildId);
 
   return member;
 }
diff --git a/src/helpers/webhooks/edit_webhook.ts b/src/helpers/webhooks/edit_webhook.ts
index fe969cd4b..e4bc4ef42 100644
--- a/src/helpers/webhooks/edit_webhook.ts
+++ b/src/helpers/webhooks/edit_webhook.ts
@@ -19,7 +19,7 @@ export async function editWebhook(
     {
       ...options,
       channel_id: options.channelId,
-    },
+    }
   );
 
   return snakeKeysToCamelCase<Webhook>(result);