diff --git a/disco/client.py b/disco/client.py
index cbb45e5..4708951 100644
--- a/disco/client.py
+++ b/disco/client.py
@@ -115,7 +115,7 @@ class Client(LoggingClass):
         ------
         status : `user.Status`
             The clients current status.
-        game : `user.Game`
+        game : `user.Activity`
             If passed, the game object to set for the users presence.
         afk : bool
             Whether the client is currently afk.
@@ -123,7 +123,7 @@ class Client(LoggingClass):
             How long the client has been afk for (in seconds).
         """
         if game and not isinstance(game, Activity):
-            raise TypeError('Game must be a Game model')
+            raise TypeError('Game must be an Activity model')
 
         if status is Status.IDLE and not since:
             since = int(time.time() * 1000)
diff --git a/disco/types/message.py b/disco/types/message.py
index ecfacdb..40c34b4 100644
--- a/disco/types/message.py
+++ b/disco/types/message.py
@@ -392,8 +392,6 @@ class Message(SlottedModel):
         The ID of this message.
     channel_id : snowflake
         The channel ID this message was sent in.
-    guild_id : snowflake
-        The server ID this message was sent in.
     author : :class:`disco.types.user.User`
         The author of this message.
     content : str
@@ -431,7 +429,6 @@ class Message(SlottedModel):
     """
     id = Field(snowflake)
     channel_id = Field(snowflake)
-    guild_id = Field(snowflake)
     author = Field(User)
     content = Field(text)
     timestamp = Field(datetime)