diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 4624617..15aed60 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -93,7 +93,7 @@
 
     private final Object lock = new Object();
 
-    private class PacketToPush {
+    private static class PacketToPush {
         public final OFPacketOut packet;
         public final long dpid;
 
@@ -103,7 +103,7 @@
         }
     }
 
-    private class PushedFlow {
+    private static class PushedFlow {
         public final String intentId;
         public boolean installed = false;
         public short firstOutPort;
@@ -113,7 +113,7 @@
         }
     }
 
-    private final class Path {
+    private static final class Path {
         public final MACAddress srcMac;
         public final MACAddress dstMac;
 
@@ -228,7 +228,7 @@
     public Command receive(
             IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
 
-        if (msg.getType() != OFType.PACKET_IN) {
+        if (msg.getType() != OFType.PACKET_IN || !(msg instanceof OFPacketIn)) {
             return Command.CONTINUE;
         }