diff --git a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
index 57249fe699e3ab7f79a56763b88a6be49557e5b8..bf0714f790e55e2bfff88831a8cd8bc1f53ac0f2 100644
--- a/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
+++ b/boards/uniboard1/designs/unb1_test/src/vhdl/unb1_test.vhd
@@ -327,8 +327,7 @@ ARCHITECTURE str OF unb1_test IS
   SIGNAL reg_dp_offload_tx_miso         : t_mem_miso;
   SIGNAL reg_dp_offload_tx_hdr_dat_mosi : t_mem_mosi;
   SIGNAL reg_dp_offload_tx_hdr_dat_miso : t_mem_miso;
-  SIGNAL reg_dp_offload_tx_hdr_ovr_mosi : t_mem_mosi;
-  SIGNAL reg_dp_offload_tx_hdr_ovr_miso : t_mem_miso;
+
   SIGNAL reg_dp_offload_rx_hdr_dat_mosi : t_mem_mosi;
   SIGNAL reg_dp_offload_rx_hdr_dat_miso : t_mem_miso;
 
@@ -584,8 +583,8 @@ BEGIN
     reg_dp_offload_tx_hdr_dat_mosi => reg_dp_offload_tx_hdr_dat_mosi,
     reg_dp_offload_tx_hdr_dat_miso => reg_dp_offload_tx_hdr_dat_miso,
 
-    reg_dp_offload_tx_hdr_ovr_mosi => reg_dp_offload_tx_hdr_ovr_mosi,
-    reg_dp_offload_tx_hdr_ovr_miso => reg_dp_offload_tx_hdr_ovr_miso,
+    reg_dp_offload_tx_hdr_ovr_mosi => OPEN, -- FIXME DS: This MM bus can be removed.
+    reg_dp_offload_tx_hdr_ovr_miso => c_mem_miso_rst, -- FIXME
 
     reg_dp_offload_rx_hdr_dat_mosi => reg_dp_offload_rx_hdr_dat_mosi,
     reg_dp_offload_rx_hdr_dat_miso => reg_dp_offload_rx_hdr_dat_miso,
@@ -650,9 +649,8 @@ BEGIN
     g_def_nof_words_per_block   => c_def_nof_words_per_block,
     g_max_nof_blocks_per_packet => c_max_nof_blocks_per_packet,
     g_def_nof_blocks_per_packet => c_def_nof_blocks_per_packet,
-    g_output_fifo_depth         => c_max_frame_nof_words,
     g_hdr_field_arr             => c_hdr_field_arr,
-    g_hdr_field_ovr_init        => c_hdr_field_ovr_init
+    g_hdr_field_sel             => c_hdr_field_ovr_init
    )
   PORT MAP (
     mm_rst                => mm_rst,
@@ -667,9 +665,6 @@ BEGIN
     reg_hdr_dat_mosi      => reg_dp_offload_tx_hdr_dat_mosi,
     reg_hdr_dat_miso      => reg_dp_offload_tx_hdr_dat_miso,
 
-    reg_hdr_ovr_mosi      => reg_dp_offload_tx_hdr_ovr_mosi,
-    reg_hdr_ovr_miso      => reg_dp_offload_tx_hdr_ovr_miso,
-
     snk_in_arr            => block_gen_src_out_arr(c_nof_streams_10GbE-1 DOWNTO 0),
     snk_out_arr           => block_gen_src_in_arr(c_nof_streams_10GbE-1 DOWNTO 0),