diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 2cd392f..b093fe1 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -170,6 +170,7 @@
      * @param request the packet request
      */
     private void pushToAllDevices(PacketRequest request) {
+        log.debug("Pushing packet request {} to all devices", request);
         for (Device device : deviceService.getDevices()) {
             pushRule(device, request);
         }
@@ -202,7 +203,8 @@
                 .add(new ObjectiveContext() {
                     @Override
                     public void onError(Objective objective, ObjectiveError error) {
-                        log.warn("Failed to install packet request {}: {}", request, error);
+                        log.warn("Failed to install packet request {} to {}: {}",
+                                 request, device.id(), error);
                     }
                 });
 
@@ -224,7 +226,8 @@
                 .remove(new ObjectiveContext() {
                     @Override
                     public void onError(Objective objective, ObjectiveError error) {
-                        log.warn("Failed to withdraw packet request {}: {}", request, error);
+                        log.warn("Failed to withdraw packet request {} from {}: {}",
+                                 request, device.id(), error);
                     }
                 });
 
@@ -308,6 +311,7 @@
                     case DEVICE_ADDED:
                     case DEVICE_AVAILABILITY_CHANGED:
                         if (deviceService.isAvailable(event.subject().id())) {
+                            log.debug("Pushing packet requests to device {}", event.subject().id());
                             for (PacketRequest request : store.existingRequests()) {
                                 pushRule(device, request);
                             }
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
index 444441b..de7a3ac 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
@@ -319,7 +319,7 @@
         NodeId master = mastershipService.getMasterFor(rule.deviceId());
 
         if (master == null) {
-            log.warn("Failed to getFlowEntry: No master for {}", rule.deviceId());
+            log.debug("Failed to getFlowEntry: No master for {}", rule.deviceId());
             return null;
         }
 
@@ -345,7 +345,7 @@
         NodeId master = mastershipService.getMasterFor(deviceId);
 
         if (master == null) {
-            log.warn("Failed to getFlowEntries: No master for {}", deviceId);
+            log.debug("Failed to getFlowEntries: No master for {}", deviceId);
             return Collections.emptyList();
         }
 
