diff --git a/guacamole-common/doc/example/ExampleTunnelServlet.java b/guacamole-common/doc/example/ExampleTunnelServlet.java
index d335754f6..00f409859 100644
--- a/guacamole-common/doc/example/ExampleTunnelServlet.java
+++ b/guacamole-common/doc/example/ExampleTunnelServlet.java
@@ -9,9 +9,9 @@ import net.sourceforge.guacamole.net.InetGuacamoleSocket;
 import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
 import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
 import net.sourceforge.guacamole.servlet.GuacamoleSession;
-import net.sourceforge.guacamole.servlet.GuacamoleTunnelServlet;
+import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 
-public class ExampleTunnelServlet extends GuacamoleTunnelServlet {
+public class ExampleTunnelServlet extends GuacamoleHTTPTunnelServlet {
 
     @Override
     protected GuacamoleTunnel doConnect(HttpServletRequest request)
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
index c5de457da..0d1164083 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/ReaderGuacamoleReader.java
@@ -53,6 +53,9 @@ import org.apache.commons.lang3.ArrayUtils;
  */
 public class ReaderGuacamoleReader implements GuacamoleReader {
 
+    /**
+     * Wrapped Reader to be used for all input.
+     */
     private Reader input;
 
     /**
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java
index ded7cf82d..fca0d6bf7 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/io/WriterGuacamoleWriter.java
@@ -50,6 +50,9 @@ import net.sourceforge.guacamole.protocol.GuacamoleInstruction;
  */
 public class WriterGuacamoleWriter implements GuacamoleWriter {
 
+    /**
+     * Wrapped Writer to be used for all output.
+     */
     private Writer output;
 
     /**
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java
index bb3268c01..af38242d6 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/net/InetGuacamoleSocket.java
@@ -54,7 +54,6 @@ import net.sourceforge.guacamole.GuacamoleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * Provides abstract socket-like access to a Guacamole connection over a given
  * hostname and port.