diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index fd083b9f0ab3021b54b457e7ace9fb8d86f9c6f8..6852adfbc8302d03681ba147fdf281f303c4d67e 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -1332,7 +1332,7 @@ public class Controller
     @Override
     public void handleOutgoingMessage(IOFSwitch sw, OFMessage m,
                                       FloodlightContext bc) {
-        if (log.isDebugEnabled()) {
+        if (log.isTraceEnabled()) {
             String str = OFMessage.getDataAsString(sw, m, bc);
             log.trace("{}", str);
         }
diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index f8057e8d162e4624e6a3c27f4c3e7e560fef28a4..40f94014248ebb04bbcbf436665464df24eccb22 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -201,6 +201,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
                 log.trace("doFlood, drop broadcast packet, pi={}, from a blocked port, " +
                          "srcSwitchTuple={}, linkInfo={}", new Object[] {pi, srcSwTuple});
             }
+            return;
         }
 
         // Set Action to flood
diff --git a/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusher.java b/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusher.java
index e82d32d35d6ee20a5ab3d43bdabbcb68372542c2..4d75aa8aa8b6998f4f3806443301a82815a8e721 100644
--- a/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusher.java
+++ b/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusher.java
@@ -267,7 +267,7 @@ public class StaticFlowEntryPusher
                 if (row.get(key) == null)
                     continue;
                 if ( key.equals(COLUMN_SWITCH) || key.equals(COLUMN_NAME)
-                        || key.equals("id")) // "id" seems implicit in cassandra
+                        || key.equals("id"))
                     continue; // already handled
                 // explicitly ignore timeouts and wildcards
                 if ( key.equals(COLUMN_HARD_TIMEOUT) || key.equals(COLUMN_IDLE_TIMEOUT) ||