diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd
index bdc55f70ba551b8520e6328919a3cb491b647c4a..bda84d7e0417f404d61c12ea99cfb379ef3bfb90 100644
--- a/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/src/vhdl/lofar2_unb2b_filterbank.vhd
@@ -527,16 +527,17 @@ BEGIN
     ram_scrap_mosi              => ram_scrap_mosi,
     ram_scrap_miso              => ram_scrap_miso,
     
+    -- Jesd reset control
+    jesd_ctrl_mosi            => jesd_ctrl_mosi,
+    jesd_ctrl_miso            => jesd_ctrl_miso,
+    
+    -- Statistics offload
     reg_sdp_info_mosi           => reg_sdp_info_mosi,
     reg_sdp_info_miso           => reg_sdp_info_miso,
     reg_stat_enable_mosi        => reg_stat_enable_mosi,
     reg_stat_enable_miso        => reg_stat_enable_miso,
     reg_stat_hdr_dat_mosi       => reg_stat_hdr_dat_mosi,
-    reg_stat_hdr_dat_miso       => reg_stat_hdr_dat_miso,
-
-    -- Jesd reset control
-    jesd_ctrl_mosi            => jesd_ctrl_mosi,
-    jesd_ctrl_miso            => jesd_ctrl_miso
+    reg_stat_hdr_dat_miso       => reg_stat_hdr_dat_miso
   );
 
   
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
index 908334954d06aea230aee7bcfe1b7cdbadd38d49..73c9dae9718a1914eb651ca88c9539b0729edf0a 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/node_sdp_filterbank.vhd
@@ -103,8 +103,6 @@ ARCHITECTURE str OF node_sdp_filterbank IS
   SIGNAL ram_st_sst_miso_arr : t_mem_miso_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst);
 
   -- Subband statistics
-  --SIGNAL ram_st_sst_mosi     : t_mem_mosi := c_mem_mosi_rst;
-  --SIGNAL ram_st_sst_miso     : t_mem_miso := c_mem_miso_rst;
   SIGNAL ram_st_offload_mosi : t_mem_mosi := c_mem_mosi_rst;
   SIGNAL ram_st_offload_miso : t_mem_miso := c_mem_miso_rst;
   
@@ -121,7 +119,6 @@ ARCHITECTURE str OF node_sdp_filterbank IS
   SIGNAL dp_selector_out_sosi_arr       : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
   SIGNAL scope_sosi_arr                 : t_dp_sosi_integer_arr(c_sdp_S_pn-1 DOWNTO 0);
 
-
 BEGIN
   ---------------------------------------------------------------
   -- SPECTRAL INVERSION 
@@ -278,7 +275,7 @@ BEGIN
   u_mem_master_mux : ENTITY mm_lib.mm_master_mux
   GENERIC MAP (
     g_nof_masters    => c_nof_masters,
-    g_rd_latency_min => 0  -- TODO
+    g_rd_latency_min => 2  -- TODO, make constant and check if value is rights
   )
   PORT MAP (
     mm_clk => mm_clk,
diff --git a/libraries/technology/ip_arria10_e1sg/generate-all-ip.sh b/libraries/technology/ip_arria10_e1sg/generate-all-ip.sh
deleted file mode 100755
index c35c6f1060310afcc7e7171bd10195cc48abcdb7..0000000000000000000000000000000000000000
--- a/libraries/technology/ip_arria10_e1sg/generate-all-ip.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash 
-
-files=`find $RADIOHDL_WORK/libraries/technology/ip_arria10_e1sg -name 'generate_ip.sh' `
-
-echo -e "About to generate the following IP blocks:\n$files\n"
-
-for f in $files ; do
-  cd `dirname $f`
-  
-  echo
-  echo -n "Entering directory: "
-  pwd
-  echo
-  
-  rm -rf generated
-  ./`basename $f`
-
-  cd -
-done
-
-echo "Done"