diff --git a/MinecraftClient/Crypto/CryptoHandler.cs b/MinecraftClient/Crypto/CryptoHandler.cs
index ae46ccf5..c917ec17 100644
--- a/MinecraftClient/Crypto/CryptoHandler.cs
+++ b/MinecraftClient/Crypto/CryptoHandler.cs
@@ -16,7 +16,7 @@ namespace MinecraftClient.Crypto
         /// <summary>
         /// Get a cryptographic service for encrypting data using the server's RSA public key
         /// </summary>
-        /// <param name="key">Byte array containing the encoded key</param>
+        /// <param name="x509key">Byte array containing the encoded key</param>
         /// <returns>Returns the corresponding RSA Crypto Service</returns>
 
         public static RSACryptoServiceProvider DecodeRSAPublicKey(byte[] x509key)
diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index e8ff5a7f..287e8d41 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -287,7 +287,6 @@ namespace MinecraftClient
         /// Perform an internal MCC command (not a server command, use SendText() instead for that!)
         /// </summary>
         /// <param name="command">The command</param>
-        /// <param name="interactive_mode">Set to true if command was sent by the user using the command prompt</param>
         /// <param name="response_msg">May contain a confirmation or error message after processing the command, or "" otherwise.</param>
         /// <returns>TRUE if the command was indeed an internal MCC command</returns>
         public bool PerformInternalCommand(string command, ref string response_msg)
@@ -565,7 +564,7 @@ namespace MinecraftClient
         /// or if a ChatBot whishes to update the player's location.
         /// </summary>
         /// <param name="location">The new location</param>
-        /// <param name="lookAt">Block coordinates to look at</param>
+        /// <param name="lookAtLocation">Block coordinates to look at</param>
         public void UpdateLocation(Location location, Location lookAtLocation)
         {
             double dx = lookAtLocation.X - (location.X - 0.5);
@@ -640,7 +639,6 @@ namespace MinecraftClient
         /// </summary>
         /// <param name="text">Text received</param>
         /// <param name="isJson">TRUE if the text is JSON-Encoded</param>
-        /// <param name="links">Links embedded in text</param>
         public void OnTextReceived(string text, bool isJson)
         {
             lock (lastKeepAliveLock)
diff --git a/MinecraftClient/Protocol/IMinecraftCom.cs b/MinecraftClient/Protocol/IMinecraftCom.cs
index 1a3c8c2e..0e5d55e8 100644
--- a/MinecraftClient/Protocol/IMinecraftCom.cs
+++ b/MinecraftClient/Protocol/IMinecraftCom.cs
@@ -25,7 +25,6 @@ namespace MinecraftClient.Protocol
         /// <summary>
         /// Disconnect from the server
         /// </summary>
-        /// <param name="message">Reason</param>
         void Disconnect();
 
         /// <summary>