diff --git a/voltha/adapters/openolt/openolt_flow_mgr.py b/voltha/adapters/openolt/openolt_flow_mgr.py
index 3b0df0f..4a57c5c 100644
--- a/voltha/adapters/openolt/openolt_flow_mgr.py
+++ b/voltha/adapters/openolt/openolt_flow_mgr.py
@@ -334,7 +334,7 @@
     def add_dhcp_trap(self, intf_id, onu_id, classifier, action, logical_flow):
 
         self.log.debug('add dhcp upstream trap', classifier=classifier,
-                       action=action)
+                       intf_id=intf_id, onu_id=onu_id, action=action)
 
         action.clear()
         action[TRAP_TO_HOST] = True
diff --git a/voltha/adapters/openolt/openolt_platform.py b/voltha/adapters/openolt/openolt_platform.py
index 5e091f6..a9dc3fd 100644
--- a/voltha/adapters/openolt/openolt_platform.py
+++ b/voltha/adapters/openolt/openolt_platform.py
@@ -103,7 +103,8 @@
 
 """
 
-MAX_ONUS_PER_PON = 112
+# MAX_ONUS_PER_PON = 112
+MAX_ONUS_PER_PON = 32
 
 def mk_alloc_id(intf_id, onu_id, idx=0):
     # FIXME - driver should do prefixing 1 << 10 as it is Maple specific
@@ -121,7 +122,7 @@
     return intf_id << 11 | onu_id << 4
 
 def mk_flow_id(intf_id, onu_id, idx):
-    return intf_id << 11 | onu_id << 4 | idx
+    return intf_id << 9 | onu_id << 4 | idx
 
 
 def onu_id_from_port_num(port_num):