diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
index 5dc3f9b377..61b4359ad6 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHandler.java
@@ -180,6 +180,7 @@ public final class OpenstackSwitchingHandler {
                 setFlatJumpRules(instPort, false);
                 setUpstreamRulesForFlat(instPort, false);
                 setDownstreamRulesForFlat(instPort, false);
+                break;
             default:
                 log.warn("Unsupported network type {}", type.name());
                 break;
diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
index fddbdfaba1..f9dea2ebf5 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/StatsFlowRuleManager.java
@@ -88,8 +88,8 @@ public class StatsFlowRuleManager implements StatsFlowRuleAdminService {
 
     private static final byte FLOW_TYPE_SONA = 1; // VLAN
 
-    private static final int MILLISECONDS = 1000;
-    private static final int REFRESH_INTERVAL = 5;
+    private static final long MILLISECONDS = 1000L;
+    private static final long REFRESH_INTERVAL = 5L;
 
     private ApplicationId appId;
 
@@ -328,7 +328,7 @@ public class StatsFlowRuleManager implements StatsFlowRuleAdminService {
             // TODO: need to make the refresh interval configurable
             sBuilder.withStartupTime(System.currentTimeMillis())
                     .withFstPktArrTime(System.currentTimeMillis())
-                    .withLstPktOffset(REFRESH_INTERVAL * MILLISECONDS)
+                    .withLstPktOffset((int) (REFRESH_INTERVAL * MILLISECONDS))
                     .withCurrAccPkts((int) entry.packets())
                     .withCurrAccBytes(entry.bytes())
                     .withErrorPkts((short) 0)