diff --git a/agent/src/core.cc b/agent/src/core.cc
index 2912932..2e12aa3 100644
--- a/agent/src/core.cc
+++ b/agent/src/core.cc
@@ -1187,7 +1187,7 @@
 
             bcmbal_tm_queue_ref val2 = { };
             val2.sched_id = get_default_tm_sched_id(network_intf_id, upstream); // NNI Scheduler ID
-            val2.queue_id = get_tm_queue_id(network_intf_id, onu_id, uni_id, gemport_id, upstream); // Queue on NNI
+            val2.queue_id = get_tm_queue_id(access_intf_id, onu_id, uni_id, gemport_id, upstream); // Queue on NNI
             BCMBAL_CFG_PROP_SET(&cfg, flow, queue, val2);
         }
     }
@@ -1302,7 +1302,7 @@
                 rate.pir = pir;
                 rate.burst = burst;
 
-                BCMBAL_CFG_PROP_SET(&cfg, tm_queue, rate, rate);
+                BCMBAL_CFG_PROP_SET(&cfg, tm_sched, rate, rate);
             }
 
             // creation_mode