diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java b/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
index cfdeb1f431..61c59a5a15 100644
--- a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
@@ -93,9 +93,9 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
         log.info("Starting optical network configuration process...");
         log.info("Optical config file set to {}", configFileName);
 
-        loadOpticalConfig();
-        parseOpticalConfig();
-        publishOpticalConfig();
+//        loadOpticalConfig();
+//        parseOpticalConfig();
+//        publishOpticalConfig();
     }
 
     @Deactivate
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java
index 62148c85d9..b78501f01f 100644
--- a/apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java
@@ -54,12 +54,17 @@ public class LambdaForwarding {
     public void activate() {
         appId = coreService.registerApplication("org.onlab.onos.fwd");
 
-        deviceService.addListener(listener);
-
         uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
         uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
         uglyMap.put(DeviceId.deviceId("of:0000ffffffffff03"), 3);
 
+        deviceService.addListener(listener);
+
+        for (Device d : deviceService.getDevices()) {
+            pushRules(d);
+        }
+
+
         log.info("Started with Application ID {}", appId.id());
     }
 
@@ -101,9 +106,6 @@ public class LambdaForwarding {
             break;
         default:
         }
-        sbuilder.matchLambda((short) 25).matchInport(PortNumber.portNumber(5));
-
-        tbuilder.setOutput(PortNumber.portNumber(5));
 
         TrafficTreatment treatement = tbuilder.build();
         TrafficSelector selector = sbuilder.build();
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java
index bb881d21c3..e1fde8aa44 100644
--- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java
@@ -143,6 +143,7 @@ public class FlowModBuilder {
                 return new LinkedList<>();
             case L0MODIFICATION:
                 acts.add(buildL0Modification(i));
+                break;
             case L2MODIFICATION:
                 acts.add(buildL2Modification(i));
                 break;