diff --git a/spinn_front_end_common/interface/interface_functions/command_sender_adder.py b/spinn_front_end_common/interface/interface_functions/command_sender_adder.py
index ba2b3699b..0f516de15 100644
--- a/spinn_front_end_common/interface/interface_functions/command_sender_adder.py
+++ b/spinn_front_end_common/interface/interface_functions/command_sender_adder.py
@@ -65,12 +65,11 @@ def add_command_senders(self) -> Iterable[CommandSender]:
         progress = ProgressBar(FecDataView.get_n_vertices(), "Adding commands")
         for vertex in progress.over(FecDataView.iterate_vertices()):
             if isinstance(vertex, AbstractSendMeMulticastCommandsVertex):
-                machine = FecDataView.get_machine()
                 link_data = None
 
                 # See if we need a specific placement for a device
                 if isinstance(vertex, ApplicationVirtualVertex):
-                    link_data = vertex.get_outgoing_link_data(machine)
+                    link_data = vertex.get_outgoing_link_data()
 
                 # allow the command sender to create key to partition map
                 self.__get_command_sender(link_data).add_commands(
diff --git a/spinn_front_end_common/utilities/report_functions/reports.py b/spinn_front_end_common/utilities/report_functions/reports.py
index 77f17e2bb..94b7cc360 100644
--- a/spinn_front_end_common/utilities/report_functions/reports.py
+++ b/spinn_front_end_common/utilities/report_functions/reports.py
@@ -663,13 +663,15 @@ def _search_route(
     text = ""
     # If the destination is virtual, replace with the real destination chip
     if isinstance(source_vertex, MachineSpiNNakerLinkVertex):
-        slink = machine.get_spinnaker_link_with_id(
+        slinks = FecDataView.get_spinnaker_links()
+        slink = slinks.get_spinnaker_link_with_id(
             source_vertex.spinnaker_link_id)
         x = slink.connected_chip_x
         y = slink.connected_chip_y
         text = f"        Virtual SpiNNaker Link {x}:{y} -> "
     elif isinstance(source_vertex, MachineFPGAVertex):
-        flink = machine.get_fpga_link_with_id(
+        fpga_links = FecDataView.get_fpga_links()
+        flink = fpga_links.get_fpga_link_with_id(
             source_vertex.fpga_id, source_vertex.fpga_link_id)
         x = flink.connected_chip_x
         y = flink.connected_chip_y