diff --git a/src/CoCSharp.Server/Core/MessageHandler.cs b/src/CoCSharp.Server/Core/MessageHandler.cs
index 19e9279..a3fa220 100644
--- a/src/CoCSharp.Server/Core/MessageHandler.cs
+++ b/src/CoCSharp.Server/Core/MessageHandler.cs
@@ -673,8 +673,20 @@ private async Task HandleCreateAlliance(IClient client, Message message, Cancell
             var clan = clanSave.ToClan();
 
             // Set the values as specified in the message.
-            clan.Name = caMessage.Name;
-            clan.Description = caMessage.Description;
+            if (String.IsNullOrEmpty(caMessage.Name))
+                clan.Name = "CoCSharp";
+            else if (caMessage.Name.Length > 15)
+                clan.Name = caMessage.Name.Substring(0, 15);
+            else
+                clan.Name = caMessage.Name;
+
+            if (caMessage.Description == null)
+                clan.Description = string.Empty;
+            else if (caMessage.Description.Length > 255)
+                clan.Description = caMessage.Description.Substring(0, 255);
+            else
+                clan.Description = caMessage.Description;
+
             clan.Badge = caMessage.Badge;
             clan.InviteType = caMessage.InviteType;
             clan.RequiredTrophies = caMessage.RequiredTrophy;
@@ -867,9 +879,12 @@ private Task HandleChatMessageClient(IClient client, Message message, Cancellati
             }
             else
             {
+                int lenght = Server.Assets.DataTables.GetTable<GlobalData>().Rows["MAX_MESSAGE_LENGTH"][0].NumberValue;
                 if (cmcMessage.TextMessage.ToLower().Contains("savegame"))
                     ChatManager.SendChatMessage(client, "Did you know? 'savegame' isn't a command and does nothing? ^^");
 
+                if (cmcMessage.TextMessage.Length > lenght)
+                    cmcMessage.TextMessage = cmcMessage.TextMessage.Substring(0, lenght);
                 var cmsMessage = new ChatMessageServerMessage
                 {
                     UserId = senderLevel.Avatar.Id,
diff --git a/src/CoCSharp/Logic/Commands/AllianceRoleUpdatedCommand.cs b/src/CoCSharp/Logic/Commands/AllianceRoleUpdatedCommand.cs
index d901fc8..0b3feeb 100644
--- a/src/CoCSharp/Logic/Commands/AllianceRoleUpdatedCommand.cs
+++ b/src/CoCSharp/Logic/Commands/AllianceRoleUpdatedCommand.cs
@@ -51,9 +51,10 @@ public override void ReadCommand(MessageReader reader)
 
             ClanId = reader.ReadInt64();
 
+            Role = (ClanMemberRole)reader.ReadInt32();
+
             Unknown1 = reader.ReadInt32();
 
-            Role = (ClanMemberRole)reader.ReadInt32();
             Tick = reader.ReadInt32();
         }
 
@@ -70,9 +71,9 @@ public override void WriteCommand(MessageWriter writer)
 
             writer.Write(ClanId);
 
-            writer.Write(Unknown1);
-
             writer.Write((int)Role);
+
+            writer.Write(Unknown1);
             writer.Write(Tick);
         }
     }