diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
index 71c70f6fa38550800b9801c87948aba81782e3c5..2e5cf9c58bbf08f67687b7fe9c6d726cc70aa557 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
@@ -288,18 +288,18 @@ PACKAGE sdp_pkg is
 
 
   -- AIT MM address widths
-  CONSTANT c_sdp_jesd204b_addr_w               : NATURAL := 8 + ceil_log2(c_sdp_S_pn); 
+  CONSTANT c_sdp_jesd204b_addr_w               : NATURAL := ceil_log2(c_sdp_S_pn) + 8; 
   CONSTANT c_sdp_jesd_ctrl_addr_w              : NATURAL := 1; 
   CONSTANT c_sdp_reg_bsn_monitor_input_addr_w  : NATURAL := 8;
-  CONSTANT c_sdp_reg_wg_addr_w                 : NATURAL := 2 + ceil_log2(c_sdp_S_pn);
-  CONSTANT c_sdp_ram_wg_addr_w                 : NATURAL := 10 + ceil_log2(c_sdp_S_pn); 
-  CONSTANT c_sdp_reg_dp_shiftram_addr_w        : NATURAL := 1 + ceil_log2(c_sdp_S_pn); 
+  CONSTANT c_sdp_reg_wg_addr_w                 : NATURAL := ceil_log2(c_sdp_S_pn) + 2; 
+  CONSTANT c_sdp_ram_wg_addr_w                 : NATURAL := ceil_log2(c_sdp_S_pn) + 10; 
+  CONSTANT c_sdp_reg_dp_shiftram_addr_w        : NATURAL := ceil_log2(c_sdp_S_pn) + 1; 
   CONSTANT c_sdp_reg_bsn_source_v2_addr_w      : NATURAL := 3;
   CONSTANT c_sdp_reg_bsn_scheduler_addr_w      : NATURAL := 1;
-  CONSTANT c_sdp_ram_diag_data_buf_bsn_addr_w  : NATURAL := ceil_log2(c_sdp_S_pn*c_sdp_V_si_db_large); -- Dimension DB address range for largest DB, so that both the large and the default small DB fit.
-  CONSTANT c_sdp_reg_diag_data_buf_bsn_addr_w  : NATURAL := 1 + ceil_log2(c_sdp_S_pn);  
-  CONSTANT c_sdp_ram_st_histogram_addr_w       : NATURAL := ceil_log2(c_sdp_S_pn*c_sdp_V_si_histogram); 
-  CONSTANT c_sdp_reg_aduh_monitor_addr_w       : NATURAL := 2 + ceil_log2(c_sdp_S_pn);
+  CONSTANT c_sdp_ram_diag_data_buf_bsn_addr_w  : NATURAL := ceil_log2(c_sdp_S_pn) + ceil_log2(c_sdp_V_si_db_large); -- Dimension DB address range for largest DB, so that both the large and the default small DB fit.
+  CONSTANT c_sdp_reg_diag_data_buf_bsn_addr_w  : NATURAL := ceil_log2(c_sdp_S_pn) + 1;  
+  CONSTANT c_sdp_ram_st_histogram_addr_w       : NATURAL := ceil_log2(c_sdp_S_pn) + ceil_log2(c_sdp_V_si_histogram); 
+  CONSTANT c_sdp_reg_aduh_monitor_addr_w       : NATURAL := ceil_log2(c_sdp_S_pn) + 2;
 
   -- FSUB MM address widths
   CONSTANT c_sdp_ram_fil_coefs_addr_w       : NATURAL := ceil_log2(c_sdp_N_fft * c_sdp_N_taps);