diff --git a/Renci.SshClient/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs b/Renci.SshClient/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
index 0d7e08b2..ae9c4d3e 100644
--- a/Renci.SshClient/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
+++ b/Renci.SshClient/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
@@ -40,8 +40,6 @@ namespace Renci.SshNet
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyboardInteractiveAuthenticationMethod"/> class.
         /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="port">The port.</param>
         /// <param name="username">The username.</param>
         /// <exception cref="ArgumentException"><paramref name="username"/> is whitespace or null.</exception>
         public KeyboardInteractiveAuthenticationMethod(string username)
diff --git a/Renci.SshClient/Renci.SshNet/MessageEventArgs.cs b/Renci.SshClient/Renci.SshNet/MessageEventArgs.cs
index 68c0f032..84248a24 100644
--- a/Renci.SshClient/Renci.SshNet/MessageEventArgs.cs
+++ b/Renci.SshClient/Renci.SshNet/MessageEventArgs.cs
@@ -14,7 +14,7 @@ namespace Renci.SshNet
         public T Message { get; private set; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="MessageEventArgs"/> class.
+        /// Initializes a new instance of the <see cref="MessageEventArgs&lt;T&gt;"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <exception cref="ArgumentNullException"><paramref name="message"/> is null.</exception>
diff --git a/Renci.SshClient/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs b/Renci.SshClient/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
index f21ec2bb..96b2b87a 100644
--- a/Renci.SshClient/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
+++ b/Renci.SshClient/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
@@ -40,7 +40,7 @@ namespace Renci.SshNet.Messages.Connection
         /// Initializes a new instance of the <see cref="ExecRequestInfo"/> class.
         /// </summary>
         /// <param name="command">The command.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="command"/> is null.</exception>
+        /// <exception cref="System.ArgumentNullException"><paramref name="command"/> is null.</exception>
         public ExecRequestInfo(string command)
             : this()
         {
diff --git a/Renci.SshClient/Renci.SshNet/NetConfClient.cs b/Renci.SshClient/Renci.SshNet/NetConfClient.cs
index 2ab57b4e..c59f8271 100644
--- a/Renci.SshClient/Renci.SshNet/NetConfClient.cs
+++ b/Renci.SshClient/Renci.SshNet/NetConfClient.cs
@@ -151,6 +151,7 @@ namespace Renci.SshNet
             return SendReceiveRpc(rpc);
         }
 
+        /// <exception cref="SshConnectionException">Client is not connected.</exception>
         public XmlDocument SendCloseRpc()
         {
             this.EnsureConnection();
diff --git a/Renci.SshClient/Renci.SshNet/NoneAuthenticationMethod.cs b/Renci.SshClient/Renci.SshNet/NoneAuthenticationMethod.cs
index a33facde..30fbd43c 100644
--- a/Renci.SshClient/Renci.SshNet/NoneAuthenticationMethod.cs
+++ b/Renci.SshClient/Renci.SshNet/NoneAuthenticationMethod.cs
@@ -28,8 +28,6 @@ namespace Renci.SshNet
         /// <summary>
         /// Initializes a new instance of the <see cref="KeyboardInteractiveConnectionInfo"/> class.
         /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="port">The port.</param>
         /// <param name="username">The username.</param>
         /// <exception cref="ArgumentException"><paramref name="username"/> is whitespace or null.</exception>
         public NoneAuthenticationMethod(string username)
diff --git a/Renci.SshClient/Renci.SshNet/PasswordAuthenticationMethod.cs b/Renci.SshClient/Renci.SshNet/PasswordAuthenticationMethod.cs
index 62caec99..98f92c8d 100644
--- a/Renci.SshClient/Renci.SshNet/PasswordAuthenticationMethod.cs
+++ b/Renci.SshClient/Renci.SshNet/PasswordAuthenticationMethod.cs
@@ -42,8 +42,6 @@ namespace Renci.SshNet
         /// <summary>
         /// Initializes a new instance of the <see cref="PasswordAuthenticationMethod"/> class.
         /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="port">The port.</param>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
         /// <exception cref="ArgumentException"><paramref name="username"/> is whitespace or null.</exception>
diff --git a/Renci.SshClient/Renci.SshNet/PrivateKeyAuthenticationMethod.cs b/Renci.SshClient/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
index 8f45851f..7ebb9256 100644
--- a/Renci.SshClient/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
+++ b/Renci.SshClient/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
@@ -37,8 +37,6 @@ namespace Renci.SshNet
         /// <summary>
         /// Initializes a new instance of the <see cref="PrivateKeyAuthenticationMethod"/> class.
         /// </summary>
-        /// <param name="host">The host.</param>
-        /// <param name="port">The port.</param>
         /// <param name="username">The username.</param>
         /// <param name="keyFiles">The key files.</param>
         /// <exception cref="ArgumentException"><paramref name="username"/> is whitespace or null.</exception>
diff --git a/Renci.SshClient/Renci.SshNet/ScpClient.NET.cs b/Renci.SshClient/Renci.SshNet/ScpClient.NET.cs
index 01544b37..2b2b7815 100644
--- a/Renci.SshClient/Renci.SshNet/ScpClient.NET.cs
+++ b/Renci.SshClient/Renci.SshNet/ScpClient.NET.cs
@@ -59,7 +59,7 @@ namespace Renci.SshNet
         /// </summary>
         /// <param name="directoryInfo">Local directory to upload.</param>
         /// <param name="filename">Remote host directory name.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="ArgumentNullException"/> or <paramref name="filename"/> is null.</exception>
+        /// <exception cref="ArgumentNullException"><paramref name="directoryInfo"/> or <paramref name="filename"/> is null.</exception>
         public void Upload(DirectoryInfo directoryInfo, string filename)
         {
             if (directoryInfo == null)
diff --git a/Renci.SshClient/Renci.SshNet/Security/Cryptography/HMAC.cs b/Renci.SshClient/Renci.SshNet/Security/Cryptography/HMAC.cs
index 8152ff6d..03dbf97d 100644
--- a/Renci.SshClient/Renci.SshNet/Security/Cryptography/HMAC.cs
+++ b/Renci.SshClient/Renci.SshNet/Security/Cryptography/HMAC.cs
@@ -154,6 +154,10 @@ namespace Renci.SshNet.Security.Cryptography
             }
         }
 
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged ResourceMessages.</param>
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);