diff --git a/boards.txt b/boards.txt
index 612abde2dd..78cd0b23bd 100644
--- a/boards.txt
+++ b/boards.txt
@@ -527,7 +527,7 @@ Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.board=NUCLEO_WL55JC1
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.series=STM32WLxx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.product_line=STM32WLE5xx
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
-Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.cmsis_lib_gcc=arm_cortexM4lf_math
+Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.cmsis_lib_gcc=arm_cortexM4l_math
 Nucleo_64.menu.pnum.NUCLEO_WL55JC1.build.extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
 
 # Upload menu
@@ -5487,7 +5487,7 @@ GenWL.build.extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSe
 GenWL.build.mcu=cortex-m4
 #GenWL.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
 GenWL.build.series=STM32WLxx
-GenWL.build.cmsis_lib_gcc=arm_cortexM4lf_math
+GenWL.build.cmsis_lib_gcc=arm_cortexM4l_math
 
 # Generic node SE by The Things Industries
 GenWL.menu.pnum.GENERIC_NODE_SE_TTI=Generic Node SE (TTI)
diff --git a/system/STM32WLxx/system_stm32wlxx.c b/system/STM32WLxx/system_stm32wlxx.c
index 7b583baaf0..e88b556831 100644
--- a/system/STM32WLxx/system_stm32wlxx.c
+++ b/system/STM32WLxx/system_stm32wlxx.c
@@ -112,12 +112,11 @@
      in Sram else user remap will be done by default in Flash. */
 /* #define VECT_TAB_SRAM */
 
+#if defined(CORE_CM0PLUS)
 #ifndef VECT_TAB_OFFSET
 #define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
                                                      This value must be a multiple of 0x100. */
 #endif
-
-#if defined(CORE_CM0PLUS)
 #if defined(VECT_TAB_SRAM)
 #define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x100. */
@@ -127,6 +126,10 @@
 #endif /* VECT_TAB_SRAM */
 
 #else /* CORE_CM4 */
+#ifndef VECT_TAB_OFFSET
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
 #if defined(VECT_TAB_SRAM)
 #define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
                                                      This value must be a multiple of 0x100. */