diff --git a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd
index 1622f91ceb4d71726d1bf876e286837cdab68418..08e9c515ba5ee06a3cbe13078105adcb0c14f806 100644
--- a/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd
+++ b/boards/uniboard2/libraries/unb2_board/src/vhdl/unb2_board_system_info_reg.vhd
@@ -74,10 +74,10 @@ END unb2_board_system_info_reg;
 
 ARCHITECTURE rtl OF unb2_board_system_info_reg IS
 
-  CONSTANT c_nof_fixed_regs       : NATURAL := 2; -- info
-  CONSTANT c_nof_design_name_regs : NATURAL := 8; -- design_name
-  CONSTANT c_nof_stamp_regs       : NATURAL := 3; -- date, time, svn rev
-  CONSTANT c_nof_design_note_regs : NATURAL := 8; -- note
+  CONSTANT c_nof_fixed_regs       : NATURAL := 2;  -- info, use_phy
+  CONSTANT c_nof_design_name_regs : NATURAL := 13; -- design_name
+  CONSTANT c_nof_stamp_regs       : NATURAL := 3;  -- date, time, svn rev
+  CONSTANT c_nof_design_note_regs : NATURAL := 13; -- note
 
   CONSTANT c_nof_regs             : NATURAL := c_nof_fixed_regs + c_nof_design_name_regs + c_nof_stamp_regs + c_nof_design_note_regs;
 
@@ -87,8 +87,8 @@ ARCHITECTURE rtl OF unb2_board_system_info_reg IS
                                          nof_dat  => c_nof_regs,
                                          init_sl  => '0');   
 
-  CONSTANT c_use_phy_w     : NATURAL := 8; -- FIXME: to be removed
-  CONSTANT c_use_phy       : STD_LOGIC_VECTOR(c_use_phy_w-1 DOWNTO 0) := (OTHERS=> '0'); -- FIXME: to be removed
+  CONSTANT c_use_phy_w     : NATURAL := 8;
+  CONSTANT c_use_phy       : STD_LOGIC_VECTOR(c_use_phy_w-1 DOWNTO 0) := (OTHERS=> '0'); -- Unused but keep for compatibillity
 
   CONSTANT c_design_name    : t_slv_32_arr(0 TO c_nof_design_name_regs-1) := str_to_ascii_slv_32_arr(g_design_name, c_nof_design_name_regs);
   CONSTANT c_design_note    : t_slv_32_arr(0 TO c_nof_design_note_regs-1) := str_to_ascii_slv_32_arr(g_design_note, c_nof_design_note_regs);
diff --git a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd
index 1622f91ceb4d71726d1bf876e286837cdab68418..08e9c515ba5ee06a3cbe13078105adcb0c14f806 100644
--- a/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd
+++ b/boards/uniboard2a/libraries/unb2a_board/src/vhdl/unb2_board_system_info_reg.vhd
@@ -74,10 +74,10 @@ END unb2_board_system_info_reg;
 
 ARCHITECTURE rtl OF unb2_board_system_info_reg IS
 
-  CONSTANT c_nof_fixed_regs       : NATURAL := 2; -- info
-  CONSTANT c_nof_design_name_regs : NATURAL := 8; -- design_name
-  CONSTANT c_nof_stamp_regs       : NATURAL := 3; -- date, time, svn rev
-  CONSTANT c_nof_design_note_regs : NATURAL := 8; -- note
+  CONSTANT c_nof_fixed_regs       : NATURAL := 2;  -- info, use_phy
+  CONSTANT c_nof_design_name_regs : NATURAL := 13; -- design_name
+  CONSTANT c_nof_stamp_regs       : NATURAL := 3;  -- date, time, svn rev
+  CONSTANT c_nof_design_note_regs : NATURAL := 13; -- note
 
   CONSTANT c_nof_regs             : NATURAL := c_nof_fixed_regs + c_nof_design_name_regs + c_nof_stamp_regs + c_nof_design_note_regs;
 
@@ -87,8 +87,8 @@ ARCHITECTURE rtl OF unb2_board_system_info_reg IS
                                          nof_dat  => c_nof_regs,
                                          init_sl  => '0');   
 
-  CONSTANT c_use_phy_w     : NATURAL := 8; -- FIXME: to be removed
-  CONSTANT c_use_phy       : STD_LOGIC_VECTOR(c_use_phy_w-1 DOWNTO 0) := (OTHERS=> '0'); -- FIXME: to be removed
+  CONSTANT c_use_phy_w     : NATURAL := 8;
+  CONSTANT c_use_phy       : STD_LOGIC_VECTOR(c_use_phy_w-1 DOWNTO 0) := (OTHERS=> '0'); -- Unused but keep for compatibillity
 
   CONSTANT c_design_name    : t_slv_32_arr(0 TO c_nof_design_name_regs-1) := str_to_ascii_slv_32_arr(g_design_name, c_nof_design_name_regs);
   CONSTANT c_design_note    : t_slv_32_arr(0 TO c_nof_design_note_regs-1) := str_to_ascii_slv_32_arr(g_design_note, c_nof_design_note_regs);