diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
index f1238ddcf..89aaf5fde 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
@@ -27,7 +27,7 @@ namespace Discord
         /// <summary> 
         ///     Returns the maximum length of description allowed by Discord. 
         /// </summary>
-        public const int MaxDescriptionLength = 2048;
+        public const int MaxDescriptionLength = 4096;
         /// <summary> 
         ///     Returns the maximum length of total characters allowed by Discord. 
         /// </summary>
diff --git a/src/Discord.Net.Core/Entities/Teams/ITeam.cs b/src/Discord.Net.Core/Entities/Teams/ITeam.cs
index 5ef3e4253..b6e3d987b 100644
--- a/src/Discord.Net.Core/Entities/Teams/ITeam.cs
+++ b/src/Discord.Net.Core/Entities/Teams/ITeam.cs
@@ -20,6 +20,10 @@ namespace Discord
         /// </summary>
         IReadOnlyList<ITeamMember> TeamMembers { get; }
         /// <summary>
+        ///     Gets the name of this team.
+        /// </summary>
+        string Name { get; }
+        /// <summary>
         ///     Gets the user identifier that owns this team.
         /// </summary>
         ulong OwnerUserId { get; }
diff --git a/src/Discord.Net.Core/Extensions/EmbedBuilderExtensions.cs b/src/Discord.Net.Core/Extensions/EmbedBuilderExtensions.cs
index a3b8ddd5b..c05df7cb7 100644
--- a/src/Discord.Net.Core/Extensions/EmbedBuilderExtensions.cs
+++ b/src/Discord.Net.Core/Extensions/EmbedBuilderExtensions.cs
@@ -27,7 +27,7 @@ namespace Discord
 
         /// <summary> Fills the embed author field with the provided user's full username and avatar URL. </summary>
         public static EmbedBuilder WithAuthor(this EmbedBuilder builder, IUser user) =>
-            builder.WithAuthor($"{user.Username}#{user.Discriminator}", user.GetAvatarUrl());
+            builder.WithAuthor($"{user.Username}#{user.Discriminator}", user.GetAvatarUrl() ?? user.GetDefaultAvatarUrl());
 
         /// <summary> Converts a <see cref="EmbedType.Rich"/> <see cref="IEmbed"/> object to a <see cref="EmbedBuilder"/>. </summary>
         /// <exception cref="InvalidOperationException">The embed type is not <see cref="EmbedType.Rich"/>.</exception>
diff --git a/src/Discord.Net.Rest/API/Common/Team.cs b/src/Discord.Net.Rest/API/Common/Team.cs
index 4910f43f7..852368522 100644
--- a/src/Discord.Net.Rest/API/Common/Team.cs
+++ b/src/Discord.Net.Rest/API/Common/Team.cs
@@ -11,6 +11,8 @@ namespace Discord.API
         public ulong Id { get; set; }
         [JsonProperty("members")]
         public TeamMember[] TeamMembers { get; set; }
+        [JsonProperty("name")]
+        public string Name { get; set; }
         [JsonProperty("owner_user_id")]
         public ulong OwnerUserId { get; set; }
     }
diff --git a/src/Discord.Net.Rest/Entities/Teams/RestTeam.cs b/src/Discord.Net.Rest/Entities/Teams/RestTeam.cs
index 2343f8b5d..43c9417cc 100644
--- a/src/Discord.Net.Rest/Entities/Teams/RestTeam.cs
+++ b/src/Discord.Net.Rest/Entities/Teams/RestTeam.cs
@@ -12,6 +12,8 @@ namespace Discord.Rest
         /// <inheritdoc />
         public IReadOnlyList<ITeamMember> TeamMembers { get; private set; }
         /// <inheritdoc />
+        public string Name { get; private set; }
+        /// <inheritdoc />
         public ulong OwnerUserId { get; private set; }
 
         private string _iconId;
@@ -30,6 +32,7 @@ namespace Discord.Rest
         {
             if (model.Icon.IsSpecified)
                 _iconId = model.Icon.Value;
+            Name = model.Name;
             OwnerUserId = model.OwnerUserId;
             TeamMembers = model.TeamMembers.Select(x => new RestTeamMember(Discord, x)).ToImmutableArray();
         }
diff --git a/test/Discord.Net.Tests.Unit/EmbedBuilderTests.cs b/test/Discord.Net.Tests.Unit/EmbedBuilderTests.cs
index 6cfdc83b2..da21afee1 100644
--- a/test/Discord.Net.Tests.Unit/EmbedBuilderTests.cs
+++ b/test/Discord.Net.Tests.Unit/EmbedBuilderTests.cs
@@ -126,7 +126,7 @@ namespace Discord
         {
             IEnumerable<string> GetInvalid()
             {
-                yield return new string('a', 2049);
+                yield return new string('a', 4097);
             }
             foreach (var description in GetInvalid())
             {
@@ -149,7 +149,7 @@ namespace Discord
             {
                 yield return string.Empty;
                 yield return null;
-                yield return new string('a', 2048);
+                yield return new string('a', 4096);
             }
             foreach (var description in GetValid())
             {