diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
index 4ba9b54..9ef1a1f 100755
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
@@ -55,7 +55,7 @@
         }
     }
 
-    class PerfLogger {
+    static class PerfLogger {
         private LinkedList<PerfLog> logData = new LinkedList<>();
 
         public PerfLogger(String logPhase) {
diff --git a/src/main/java/net/onrc/onos/core/packet/BPDU.java b/src/main/java/net/onrc/onos/core/packet/BPDU.java
index ce0d9a2..38e979c 100644
--- a/src/main/java/net/onrc/onos/core/packet/BPDU.java
+++ b/src/main/java/net/onrc/onos/core/packet/BPDU.java
@@ -31,7 +31,7 @@
         TOPOLOGY_CHANGE;
     }
 
-    private final long destMac = 0x0180c2000000L; // 01-80-c2-00-00-00
+    private static final long DEST_MAC = 0x0180c2000000L; // 01-80-c2-00-00-00
 
     // TODO - check this for RSTP
     private LLC llcHeader;
@@ -134,6 +134,6 @@
     }
 
     public long getDestMac() {
-        return destMac;
+        return DEST_MAC;
     }
 }