diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index 3a2f85987..d2f751230 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -1667,8 +1667,9 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
      */
     void routerDisconnected() {
         _log.error(getPrefix() + "Router disconnected - firing notification events");
-            for (ConnectionEventListener lsnr : listeners)
+            for (ConnectionEventListener lsnr : listeners) {
                 if (lsnr != null) lsnr.routerDisconnected();
+            }
     }
 
     /**
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
index 86e6d0e5e..63b15c829 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
@@ -93,8 +93,9 @@ class MessageHandler implements I2PSessionMuxedListener {
             _log.warn("I2PSession disconnected");
         _manager.disconnectAllHard();
         
-        for (I2PSocketManager.DisconnectListener lsnr : _listeners)
+        for (I2PSocketManager.DisconnectListener lsnr : _listeners) {
             lsnr.sessionDisconnected();
+        }
         _listeners.clear();
     }
 
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 2b2a3f23c..bded822b3 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -421,12 +421,14 @@ public class WebMail extends HttpServlet
 					return;
 				}
 			}
-			for( MailPart part : mailPart.parts )
+			for( MailPart part : mailPart.parts ) {
 				showPart( out, part, level + 1, html );
+			}
 		}
 		else if( mailPart.message ) {
-			for( MailPart part : mailPart.parts )
+			for( MailPart part : mailPart.parts ) {
 				showPart( out, part, level + 1, html );
+			}
 		}
 		else {
 			boolean showBody = false;
diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
index bf415f6b5..4f4dba1e7 100644
--- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
@@ -541,10 +541,12 @@ public class TransientSessionKeyManager extends SessionKeyManager {
         if (old != null) {
             // drop both old and tagSet tags
             synchronized (_inboundTagSets) {
-                for (SessionTag tag : old.getTags())
+                for (SessionTag tag : old.getTags()) {
                     _inboundTagSets.remove(tag);
-                for (SessionTag tag : sessionTags)
+                }
+                for (SessionTag tag : sessionTags) {
                     _inboundTagSets.remove(tag);
+                }
             }
 
             if (_log.shouldLog(Log.WARN)) {
diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java
index 0331ac96c..b8cf6c466 100644
--- a/core/java/src/net/i2p/stat/StatManager.java
+++ b/core/java/src/net/i2p/stat/StatManager.java
@@ -62,8 +62,9 @@ public class StatManager {
     public StatLog getStatLog() { return _statLog; }
     public void setStatLog(StatLog log) { 
         _statLog = log; 
-            for (RateStat rs : _rateStats.values())
+            for (RateStat rs : _rateStats.values()) {
                 rs.setStatLog(log);
+            }
     }
 
     /**
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 4bab3bd06..02b60d3e3 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -124,15 +124,18 @@ class ClientManager {
             _listener.stopListening();
         Set<ClientConnectionRunner> runners = new HashSet<ClientConnectionRunner>();
         synchronized (_runners) {
-            for (ClientConnectionRunner runner : _runners.values())
+            for (ClientConnectionRunner runner : _runners.values()) {
                 runners.add(runner);
+            }
         }
         synchronized (_pendingRunners) {
-            for (ClientConnectionRunner runner : _pendingRunners)
+            for (ClientConnectionRunner runner : _pendingRunners) {
                 runners.add(runner);
+            }
         }
-        for (ClientConnectionRunner runner : runners)
+        for (ClientConnectionRunner runner : runners) {
             runner.disconnectClient(msg, Log.WARN);
+        }
         _runnersByHash.clear();
     }
     
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
index 5473f891b..cbe5037a8 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
@@ -190,26 +190,30 @@ class StoreState {
         buf.append(" Attempted: ");
         synchronized (_attemptedPeers) {
             buf.append(_attemptedPeers.size()).append(' ');
-            for (Hash peer : _attemptedPeers)
+            for (Hash peer : _attemptedPeers) {
                 buf.append(peer.toBase64()).append(" ");
+            }
         }
         buf.append(" Pending: ");
         synchronized (_pendingPeers) {
             buf.append(_pendingPeers.size()).append(' ');
-            for (Hash peer : _pendingPeers)
+            for (Hash peer : _pendingPeers) {
                 buf.append(peer.toBase64()).append(" ");
+            }
         }
         buf.append(" Failed: ");
         synchronized (_failedPeers) { 
             buf.append(_failedPeers.size()).append(' ');
-            for (Hash peer : _failedPeers)
+            for (Hash peer : _failedPeers) {
                 buf.append(peer.toBase64()).append(" ");
+            }
         }
         buf.append(" Successful: ");
         synchronized (_successfulPeers) {
             buf.append(_successfulPeers.size()).append(' ');
-            for (Hash peer : _successfulPeers)
+            for (Hash peer : _successfulPeers) {
                 buf.append(peer.toBase64()).append(" ");
+            }
         }
 /****
         buf.append(" Successful Exploratory: ");