diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index c4412346b..dd0c477f5 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -198,7 +198,6 @@ public class SOCKS5Server extends SOCKSServer {
         addressType = in.readUnsignedByte();
         switch (addressType) {
         case AddressType.IPV4:
-            //connHostName = new String();
             StringBuilder builder = new StringBuilder();
             for (int i = 0; i < 4; ++i) {
                 int octet = in.readUnsignedByte();
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index 3d0cf7cda..ef84c265b 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -28,7 +28,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 <%@include file="formhandler.jsi" %>
  <div class="configure">
  <h3><%=intl._("Client Configuration")%></h3><p>
- <%=intl._("The Java clients listed below are started by the router and run in the same JVM.")%>
+ <%=intl._("The Java clients listed below are started by the router and run in the same JVM.")%><br>
+ <span style="color: #FF0000;"><b><%=intl._("Be careful changing any settings here. The 'router console' and 'application tunnels' are required for most uses of I2P. Only advanced users should change these.")%></b></span>
  </p><div class="wideload">
 <form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
diff --git a/history.txt b/history.txt
index e00991d01..4e0bf7061 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2013-12-25 dg
+ * Console: Add 'advanced warning' to /confgiclients
+ * SOCKS5Server: Remove redundant, commented out line from my previous findbugs
+
 2013-12-19 zzz
  * NetDB: Fixes for ExpireRoutersJob
   - Don't expire if too few routers