diff --git a/discord/mentions.py b/discord/mentions.py
index 84a1aca6b..dd2929712 100644
--- a/discord/mentions.py
+++ b/discord/mentions.py
@@ -135,9 +135,9 @@ class AllowedMentions:
         return data  # type: ignore
 
     def merge(self, other: AllowedMentions) -> AllowedMentions:
-        # Creates a new AllowedMentions by merging from another one.
+        # Creates a new AllowedMentions by merging from another one
         # Merge is done by using the 'self' values unless explicitly
-        # overridden by the 'other' values.
+        # overridden by the 'other' values
         everyone = self.everyone if other.everyone is default else other.everyone
         users = self.users if other.users is default else other.users
         roles = self.roles if other.roles is default else other.roles
diff --git a/discord/tracking.py b/discord/tracking.py
index b67c89c04..4d0a4466e 100644
--- a/discord/tracking.py
+++ b/discord/tracking.py
@@ -70,7 +70,7 @@ class ContextProperties:  # Thank you Discord-S.C.U.M
         try:
             return library[data.get('location', 'None')]
         except KeyError:
-            return b64encode(json.dumps(data).encode()).decode('utf-8')
+            return b64encode(json.dumps(data, separators=(',', ':')).encode()).decode('utf-8')
 
     @classmethod
     def _empty(cls) -> ContextProperties: