diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index e48a6bc569759e0b2d389abe6205339a4748d63f..9a8379111a5c54ea1fb9e9d839aa489c68deb2f2 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -366,7 +366,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
      * @since 0.9.1
      */
     public void setClientOptions(Properties opts) {
-        for (Iterator iter = _clientOptions.keySet().iterator(); iter.hasNext();) {
+        for (Iterator<Object> iter = _clientOptions.keySet().iterator(); iter.hasNext();) {
             Object key = iter.next();
             if (!opts.containsKey(key))
                 iter.remove();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 8d5f4ff4baa13ddfd0cd8b230be6080b14a3dc23..d246e61e16de16e86149c1d19c064127b6e72b40 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -365,7 +365,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
      */
     private void buildSocketMap(Properties props) {
         _socketMap.clear();
-        for (Map.Entry e : props.entrySet()) {
+        for (Map.Entry<Object, Object> e : props.entrySet()) {
             String key = (String) e.getKey();
             if (key.startsWith("targetForPort.")) {
                 key = key.substring("targetForPort.".length());
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index a02de79b2601cb58e91b8d52f81512c970b973fe..1b1fdefcfabf14576c874702e68ae93e5f56d407 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -413,7 +413,7 @@ public class TunnelController implements Logging {
      */
     public Properties getClientOptionProps() {
         Properties opts = new Properties();
-        for (Map.Entry e : _config.entrySet()) {
+        for (Map.Entry<Object, Object> e : _config.entrySet()) {
             String key = (String) e.getKey();
             if (key.startsWith("option.")) {
                 key = key.substring("option.".length());
@@ -471,7 +471,7 @@ public class TunnelController implements Logging {
      */
     public void setConfig(Properties config, String prefix) {
         Properties props = new Properties();
-        for (Map.Entry e : config.entrySet()) {
+        for (Map.Entry<Object, Object> e : config.entrySet()) {
             String key = (String) e.getKey();
             if (key.startsWith(prefix)) {
                 key = key.substring(prefix.length());
@@ -516,7 +516,7 @@ public class TunnelController implements Logging {
      */
     public Properties getConfig(String prefix) { 
         Properties rv = new Properties();
-        for (Map.Entry e : _config.entrySet()) {
+        for (Map.Entry<Object, Object> e : _config.entrySet()) {
             String key = (String) e.getKey();
             String val = (String) e.getValue();
             rv.setProperty(prefix + key, val);
@@ -538,7 +538,7 @@ public class TunnelController implements Logging {
      */
     public String getClientOptions() {
         StringBuilder opts = new StringBuilder(64);
-        for (Map.Entry e : _config.entrySet()) {
+        for (Map.Entry<Object, Object> e : _config.entrySet()) {
             String key = (String) e.getKey();
             if (key.startsWith("option.")) {
                 key = key.substring("option.".length());
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
index b66d613a8ced9f0545e75fb04e162f351737b179..f6df4a56b5fd2820e03f06f67b2fd8598b96331e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
@@ -70,7 +70,7 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
     private void parseOptions() {
         Properties opts = getTunnel().getClientOptions();
         proxies = new HashMap<String, List<String>>(1);
-        for (Map.Entry e : opts.entrySet()) {
+        for (Map.Entry<Object, Object> e : opts.entrySet()) {
            String prop = (String)e.getKey();
            if ((!prop.startsWith(PROP_PROXY_PREFIX)) || prop.length() <= PROP_PROXY_PREFIX.length())
               continue;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index c3160b841980d1c2cce83ccbe53b75517bf8d827..6e917cf0c13725e81306fac0803a51a9e2c40e42 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -373,7 +373,7 @@ public class EditBean extends IndexBean {
             boolean isMD5Proxy = "httpclient".equals(tun.getType()) ||
                                  "connectclient".equals(tun.getType());
             Map<String, String> sorted = new TreeMap<String, String>();
-            for (Map.Entry e : opts.entrySet()) {
+            for (Map.Entry<Object, Object> e : opts.entrySet()) {
                 String key = (String)e.getKey();
                 if (_noShowSet.contains(key))
                     continue;