diff --git a/df_datalink_sp/src/networking/link_layer/scan.c b/df_datalink_sp/src/networking/link_layer/scan.c
index b9460c9..837829c 100644
--- a/df_datalink_sp/src/networking/link_layer/scan.c
+++ b/df_datalink_sp/src/networking/link_layer/scan.c
@@ -406,7 +406,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 		L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSZ, L2_MSG_ADV_SRC_POSZ_LEN, &nodePos);
 		node->nodeInfo.pos.z = (double) nodePos;
 		node->nodeInfo.beamNo = Phy_LastScanBeamNo(instPtr->config.phyInstPtr);
-		
+
 		// log last scan beam number
 		instPtr->log.scanBeamNo = node->nodeInfo.beamNo;
 
@@ -608,12 +608,12 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 		if (rtneEntry->dst == L2_GetNodeId(instPtr) || rtneEntry->dst == L2_BROADCAST_ID)
 		{
 			torState = L2_TOR_RX;
-			commNode = L2_GetNodeById(rtneEntry->dst);
+			commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->dst);
 		}
 		else if (rtneEntry->src == L2_GetNodeId(instPtr) || rtneEntry->src == L2_BROADCAST_ID)
 		{
 			torState = L2_TOR_TX;
-			commNode = L2_GetNodeById(rtneEntry->src);
+			commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 		}
 		else
 		{
@@ -624,7 +624,7 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
 		instPtr->log.lastBeamWidth = PHY_ANT_BEAM_25;
 		if (commNode != NULL)
 		{
-			Phy_SetBeamNo(commNode->nodeInfo.beamNo);
+			Phy_SetBeamNo(instPtr->config.phyInstPtr, commNode->nodeInfo.beamNo);
 		}
 	}
 	else
diff --git a/df_datalink_sp/src/networking/link_layer/service.c b/df_datalink_sp/src/networking/link_layer/service.c
index 3b1a204..2b583e9 100644
--- a/df_datalink_sp/src/networking/link_layer/service.c
+++ b/df_datalink_sp/src/networking/link_layer/service.c
@@ -373,12 +373,12 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
 	if (rtneEntry->src == L2_GetNodeId(instPtr))
 	{
 		torState = L2_TOR_TX;
-		commNode = L2_GetNodeById(rtneEntry->src);
+		commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 	}
 	else if (rtneEntry->dst == L2_GetNodeId(instPtr))
 	{
 		torState = L2_TOR_RX;
-		commNode = L2_GetNodeById(rtneEntry->src);
+		commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
 	}
 	else
 	{