diff --git a/ChangeLog b/ChangeLog
index 464995c..6ad9d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2022-04-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (_regnual_start): Fix type.
+	* src/main.c (main): Fix address for _regnual_start.
+	* src/usb_ctrl.c (mem_info, usb_setup): Follow the change.
+	* src/flash.c (_keystore_pool, _data_pool): Fix type.
+	(FLASH_ADDR_KEY_STORAGE_START, FLASH_ADDR_DATA_STORAGE_START):
+	Follow the change.
+
+2022-03-26  Bertrand Jacquin <bertrand@jacquin.bzh>
+
+	* regnual/regnual.c (memset): Remove declaration.
+	* regnual/types.h (NULL): Remove.
+	(size_t): Remove.
+
 2021-10-12  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* VERSION: 1.2.19.
diff --git a/src/flash.c b/src/flash.c
index c1085a1..5e1b8b0 100644
--- a/src/flash.c
+++ b/src/flash.c
@@ -82,10 +82,10 @@ extern uint8_t *flash_addr_data_storage_start;
 #define FLASH_ADDR_DATA_STORAGE_START flash_addr_data_storage_start
 #else
 /* Linker sets these symbols */
-extern uint8_t _keystore_pool;
-extern uint8_t _data_pool;
-#define FLASH_ADDR_KEY_STORAGE_START  ((&_keystore_pool))
-#define FLASH_ADDR_DATA_STORAGE_START ((&_data_pool))
+extern uint8_t _keystore_pool[];
+extern uint8_t _data_pool[];
+#define FLASH_ADDR_KEY_STORAGE_START  ((_keystore_pool))
+#define FLASH_ADDR_DATA_STORAGE_START ((_data_pool))
 #endif
 
 static int key_available_at (const uint8_t *k, int key_size)
diff --git a/src/gnuk.h b/src/gnuk.h
index b5e2e68..966de44 100644
--- a/src/gnuk.h
+++ b/src/gnuk.h
@@ -475,6 +475,6 @@ int pinpad_getline (int msg_code, uint32_t timeout_usec);
 #endif
 
 
-extern uint8_t _regnual_start, __heap_end__[];
+extern uint8_t _regnual_start[], __heap_end__[];
 
 uint8_t * sram_address (uint32_t offset);
diff --git a/src/main.c b/src/main.c
index 988a35a..7f215f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -503,8 +503,8 @@ main (int argc, const char *argv[])
 
 #ifdef FLASH_UPGRADE_SUPPORT
   /* Set vector */
-  SCB->VTOR = (uintptr_t)&_regnual_start;
-  entry = calculate_regnual_entry_address (&_regnual_start);
+  SCB->VTOR = (uintptr_t)_regnual_start;
+  entry = calculate_regnual_entry_address (_regnual_start);
 #ifdef DFU_SUPPORT
   {
     /* Use SYS at ORIGIN_REAL instead of the one at ORIGIN */
diff --git a/src/usb_ctrl.c b/src/usb_ctrl.c
index 559906c..62c9ab9 100644
--- a/src/usb_ctrl.c
+++ b/src/usb_ctrl.c
@@ -227,7 +227,7 @@ static const uint8_t lun_table[] = { 0, 0, 0, 0, };
 #endif
 
 #ifdef FLASH_UPGRADE_SUPPORT
-static const uint8_t *const mem_info[] = { &_regnual_start,  __heap_end__, };
+static const uint8_t *const mem_info[] = { _regnual_start,  __heap_end__, };
 #endif
 
 #define USB_FSIJ_GNUK_MEMINFO     0
@@ -284,7 +284,7 @@ usb_setup (struct usb_dev *dev)
 	      if (ccid_get_ccid_state () != CCID_STATE_EXITED)
 		return -1;
 
-	      if (addr < &_regnual_start || addr + arg->len > __heap_end__)
+	      if (addr < _regnual_start || addr + arg->len > __heap_end__)
 		return -1;
 
 	      if (arg->index + arg->len < 256)