diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs
index 18ba1cfe..8469425c 100644
--- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs
+++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Boot/ide/stm32f103_crossworks.hzs
@@ -45,9 +45,9 @@
  </TraceWindow>
  <Watch1>
   <Watches active="1" update="Never" >
-   <Watchpoint linenumber="124" radix="-1" name="free_running_counter_now" expression="free_running_counter_now" filename="d:/usr/feaser/software/openblt/target/source/armcm3_stm32/timer.c" />
-   <Watchpoint linenumber="152" radix="-1" name="free_running_counter_accumulative" expression="free_running_counter_accumulative" filename="d:/usr/feaser/software/openblt/target/source/armcm3_stm32/timer.c" />
    <Watchpoint linenumber="121" radix="-1" name="free_running_counter_last" expression="free_running_counter_last" filename="d:/usr/feaser/software/openblt/target/source/armcm3_stm32/timer.c" />
+   <Watchpoint linenumber="152" radix="-1" name="free_running_counter_accumulative" expression="free_running_counter_accumulative" filename="d:/usr/feaser/software/openblt/target/source/armcm3_stm32/timer.c" />
+   <Watchpoint linenumber="124" radix="-1" name="free_running_counter_now" expression="free_running_counter_now" filename="d:/usr/feaser/software/openblt/target/source/armcm3_stm32/timer.c" />
   </Watches>
  </Watch1>
  <Watch2>
@@ -60,7 +60,7 @@
   <Watches active="0" update="Never" />
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="17" debugPath="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\main.c" y="79" path="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\main.c" left="0" selected="1" name="unnamed" top="72" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="9" debugPath="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\main.c" y="81" path="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\main.c" left="0" selected="1" name="unnamed" top="79" />
  </Files>
  <ARMCrossStudioWindow activeProject="openbtl_olimex_stm32p103" autoConnectTarget="Olimex ARM-USB-TINY" debugSearchFileMap="" fileDialogInitialDirectory="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Boot\lib\CMSIS\CM3\DeviceSupport\ST\STM32F10x" fileDialogDefaultFilter="*.c" autoConnectCapabilities="266111" debugSearchPath="" buildConfiguration="THUMB Debug" />
 </session>
diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs
index fa36ffa5..20e92386 100644
--- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs
+++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/ide/stm32f103_crossworks.hzs
@@ -56,7 +56,7 @@
   <Watches active="0" update="Never" />
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="19" debugPath="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Prog\main.c" y="24" path="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Prog\main.c" left="0" selected="1" name="unnamed" top="11" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="6" debugPath="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Prog\main.c" y="25" path="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Prog\main.c" left="0" selected="1" name="unnamed" top="24" />
  </Files>
  <ARMCrossStudioWindow activeProject="demoprog_olimex_stm32p103" autoConnectTarget="Olimex ARM-USB-TINY" debugSearchFileMap="" fileDialogInitialDirectory="D:\usr\feaser\software\OpenBLT\Target\Demo\ARMCM3_STM32_Olimex_STM32P103_Crossworks\Prog" fileDialogDefaultFilter="*.c" autoConnectCapabilities="266111" debugSearchPath="" buildConfiguration="THUMB Debug" />
 </session>
diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/vectors.c b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/vectors.c
index 99251cb8..bcf3ebed 100644
--- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/vectors.c
+++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_Crossworks/Prog/vectors.c
@@ -74,90 +74,90 @@ __attribute__ ((section(".vectors")))
 const tIsrFunc _vectors[] =
 {
   { .ptr = (unsigned long)&__stack_end__ },           /* the initial stack pointer     */
-  reset_handler,                                      /* the reset handler             */
-  UnusedISR,                                          /* NMI Handler                   */
-  UnusedISR,                                          /* Hard Fault Handler            */
-  UnusedISR,                                          /* MPU Fault Handler             */
-  UnusedISR,                                          /* Bus Fault Handler             */
-  UnusedISR,                                          /* Usage Fault Handler           */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* SVCall Handler                */
-  UnusedISR,                                          /* Debug Monitor Handler         */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* PendSV Handler                */
-  TimerISRHandler,                                    /* SysTick Handler               */
-  UnusedISR,                                          /* Window Watchdog               */
-  UnusedISR,                                          /* PVD through EXTI Line detect  */
-  UnusedISR,                                          /* Tamper                        */
-  UnusedISR,                                          /* RTC                           */
-  UnusedISR,                                          /* Flash                         */
-  UnusedISR,                                          /* RCC                           */
-  UnusedISR,                                          /* EXTI Line 0                   */
-  UnusedISR,                                          /* EXTI Line 1                   */
-  UnusedISR,                                          /* EXTI Line 2                   */
-  UnusedISR,                                          /* EXTI Line 3                   */
-  UnusedISR,                                          /* EXTI Line 4                   */
-  UnusedISR,                                          /* DMA1 Channel 1                */
-  UnusedISR,                                          /* DMA1 Channel 2                */
-  UnusedISR,                                          /* DMA1 Channel 3                */
-  UnusedISR,                                          /* DMA1 Channel 4                */
-  UnusedISR,                                          /* DMA1 Channel 5                */
-  UnusedISR,                                          /* DMA1 Channel 6                */
-  UnusedISR,                                          /* DMA1 Channel 7                */
-  UnusedISR,                                          /* ADC1 and ADC2                 */
-  UnusedISR,                                          /* CAN1 TX                       */
-  UnusedISR,                                          /* CAN1 RX0                      */
-  UnusedISR,                                          /* CAN1 RX1                      */
-  UnusedISR,                                          /* CAN1 SCE                      */
-  UnusedISR,                                          /* EXTI Line 9..5                */
-  UnusedISR,                                          /* TIM1 Break                    */
-  UnusedISR,                                          /* TIM1 Update                   */
-  UnusedISR,                                          /* TIM1 Trigger and Commutation  */
-  UnusedISR,                                          /* TIM1 Capture Compare          */
-  UnusedISR,                                          /* TIM2                          */
-  UnusedISR,                                          /* TIM3                          */
-  UnusedISR,                                          /* TIM4                          */
-  UnusedISR,                                          /* I2C1 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* I2C2 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* SPI1                          */
-  UnusedISR,                                          /* SPI2                          */
-  UnusedISR,                                          /* USART1                        */
-  UnusedISR,                                          /* USART2                        */
-  UnusedISR,                                          /* USART3                        */
-  UnusedISR,                                          /* EXTI Line 15..10              */
-  UnusedISR,                                          /* RTC alarm through EXTI line   */
-  UnusedISR,                                          /* USB OTG FS Wakeup             */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* TIM5                          */
-  UnusedISR,                                          /* SPI3                          */
-  UnusedISR,                                          /* UART4                         */
-  UnusedISR,                                          /* UART5                         */
-  UnusedISR,                                          /* TIM6                          */
-  UnusedISR,                                          /* TIM7                          */
-  UnusedISR,                                          /* DMA2 Channel1                 */
-  UnusedISR,                                          /* DMA2 Channel2                 */
-  UnusedISR,                                          /* DMA2 Channel3                 */
-  UnusedISR,                                          /* DMA2 Channel4                 */
-  UnusedISR,                                          /* DMA2 Channel5                 */
-  UnusedISR,                                          /* Ethernet                      */
-  UnusedISR,                                          /* Ethernet Wakeup               */
-  UnusedISR,                                          /* CAN2 TX                       */
-  UnusedISR,                                          /* CAN2 RX0                      */
-  UnusedISR,                                          /* CAN2 RX1                      */
-  UnusedISR,                                          /* CAN2 SCE                      */
-  UnusedISR,                                          /* USB OTG FS                    */
-  (void*)0x55AA11EE,                                  /* Reserved for OpenBLT checksum */
+  { reset_handler                  },                 /* the reset handler             */
+  { UnusedISR                      },                 /* NMI Handler                   */
+  { UnusedISR                      },                 /* Hard Fault Handler            */
+  { UnusedISR                      },                 /* MPU Fault Handler             */
+  { UnusedISR                      },                 /* Bus Fault Handler             */
+  { UnusedISR                      },                 /* Usage Fault Handler           */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* SVCall Handler                */
+  { UnusedISR                      },                 /* Debug Monitor Handler         */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* PendSV Handler                */
+  { TimerISRHandler                },                 /* SysTick Handler               */
+  { UnusedISR                      },                 /* Window Watchdog               */
+  { UnusedISR                      },                 /* PVD through EXTI Line detect  */
+  { UnusedISR                      },                 /* Tamper                        */
+  { UnusedISR                      },                 /* RTC                           */
+  { UnusedISR                      },                 /* Flash                         */
+  { UnusedISR                      },                 /* RCC                           */
+  { UnusedISR                      },                 /* EXTI Line 0                   */
+  { UnusedISR                      },                 /* EXTI Line 1                   */
+  { UnusedISR                      },                 /* EXTI Line 2                   */
+  { UnusedISR                      },                 /* EXTI Line 3                   */
+  { UnusedISR                      },                 /* EXTI Line 4                   */
+  { UnusedISR                      },                 /* DMA1 Channel 1                */
+  { UnusedISR                      },                 /* DMA1 Channel 2                */
+  { UnusedISR                      },                 /* DMA1 Channel 3                */
+  { UnusedISR                      },                 /* DMA1 Channel 4                */
+  { UnusedISR                      },                 /* DMA1 Channel 5                */
+  { UnusedISR                      },                 /* DMA1 Channel 6                */
+  { UnusedISR                      },                 /* DMA1 Channel 7                */
+  { UnusedISR                      },                 /* ADC1 and ADC2                 */
+  { UnusedISR                      },                 /* CAN1 TX                       */
+  { UnusedISR                      },                 /* CAN1 RX0                      */
+  { UnusedISR                      },                 /* CAN1 RX1                      */
+  { UnusedISR                      },                 /* CAN1 SCE                      */
+  { UnusedISR                      },                 /* EXTI Line 9..5                */
+  { UnusedISR                      },                 /* TIM1 Break                    */
+  { UnusedISR                      },                 /* TIM1 Update                   */
+  { UnusedISR                      },                 /* TIM1 Trigger and Commutation  */
+  { UnusedISR                      },                 /* TIM1 Capture Compare          */
+  { UnusedISR                      },                 /* TIM2                          */
+  { UnusedISR                      },                 /* TIM3                          */
+  { UnusedISR                      },                 /* TIM4                          */
+  { UnusedISR                      },                 /* I2C1 Event                    */
+  { UnusedISR                      },                 /* I2C1 Error                    */
+  { UnusedISR                      },                 /* I2C2 Event                    */
+  { UnusedISR                      },                 /* I2C1 Error                    */
+  { UnusedISR                      },                 /* SPI1                          */
+  { UnusedISR                      },                 /* SPI2                          */
+  { UnusedISR                      },                 /* USART1                        */
+  { UnusedISR                      },                 /* USART2                        */
+  { UnusedISR                      },                 /* USART3                        */
+  { UnusedISR                      },                 /* EXTI Line 15..10              */
+  { UnusedISR                      },                 /* RTC alarm through EXTI line   */
+  { UnusedISR                      },                 /* USB OTG FS Wakeup             */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* TIM5                          */
+  { UnusedISR                      },                 /* SPI3                          */
+  { UnusedISR                      },                 /* UART4                         */
+  { UnusedISR                      },                 /* UART5                         */
+  { UnusedISR                      },                 /* TIM6                          */
+  { UnusedISR                      },                 /* TIM7                          */
+  { UnusedISR                      },                 /* DMA2 Channel1                 */
+  { UnusedISR                      },                 /* DMA2 Channel2                 */
+  { UnusedISR                      },                 /* DMA2 Channel3                 */
+  { UnusedISR                      },                 /* DMA2 Channel4                 */
+  { UnusedISR                      },                 /* DMA2 Channel5                 */
+  { UnusedISR                      },                 /* Ethernet                      */
+  { UnusedISR                      },                 /* Ethernet Wakeup               */
+  { UnusedISR                      },                 /* CAN2 TX                       */
+  { UnusedISR                      },                 /* CAN2 RX0                      */
+  { UnusedISR                      },                 /* CAN2 RX1                      */
+  { UnusedISR                      },                 /* CAN2 SCE                      */
+  { UnusedISR                      },                 /* USB OTG FS                    */
+  { (void*)0x55AA11EE              },                 /* Reserved for OpenBLT checksum */
 };
 
 
diff --git a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/vectors.c b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/vectors.c
index 7f0ed4d5..9f671c56 100644
--- a/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/vectors.c
+++ b/Target/Demo/ARMCM3_STM32_Olimex_STM32P103_GCC/Prog/vectors.c
@@ -74,90 +74,90 @@ __attribute__ ((section(".isr_vector")))
 const tIsrFunc _vectab[] =
 {
   { .ptr = (unsigned long)&_estack },                 /* the initial stack pointer     */
-  reset_handler,                                      /* the reset handler             */
-  UnusedISR,                                          /* NMI Handler                   */
-  UnusedISR,                                          /* Hard Fault Handler            */
-  UnusedISR,                                          /* MPU Fault Handler             */
-  UnusedISR,                                          /* Bus Fault Handler             */
-  UnusedISR,                                          /* Usage Fault Handler           */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* SVCall Handler                */
-  UnusedISR,                                          /* Debug Monitor Handler         */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* PendSV Handler                */
-  TimerISRHandler,                                    /* SysTick Handler               */
-  UnusedISR,                                          /* Window Watchdog               */
-  UnusedISR,                                          /* PVD through EXTI Line detect  */
-  UnusedISR,                                          /* Tamper                        */
-  UnusedISR,                                          /* RTC                           */
-  UnusedISR,                                          /* Flash                         */
-  UnusedISR,                                          /* RCC                           */
-  UnusedISR,                                          /* EXTI Line 0                   */
-  UnusedISR,                                          /* EXTI Line 1                   */
-  UnusedISR,                                          /* EXTI Line 2                   */
-  UnusedISR,                                          /* EXTI Line 3                   */
-  UnusedISR,                                          /* EXTI Line 4                   */
-  UnusedISR,                                          /* DMA1 Channel 1                */
-  UnusedISR,                                          /* DMA1 Channel 2                */
-  UnusedISR,                                          /* DMA1 Channel 3                */
-  UnusedISR,                                          /* DMA1 Channel 4                */
-  UnusedISR,                                          /* DMA1 Channel 5                */
-  UnusedISR,                                          /* DMA1 Channel 6                */
-  UnusedISR,                                          /* DMA1 Channel 7                */
-  UnusedISR,                                          /* ADC1 and ADC2                 */
-  UnusedISR,                                          /* CAN1 TX                       */
-  UnusedISR,                                          /* CAN1 RX0                      */
-  UnusedISR,                                          /* CAN1 RX1                      */
-  UnusedISR,                                          /* CAN1 SCE                      */
-  UnusedISR,                                          /* EXTI Line 9..5                */
-  UnusedISR,                                          /* TIM1 Break                    */
-  UnusedISR,                                          /* TIM1 Update                   */
-  UnusedISR,                                          /* TIM1 Trigger and Commutation  */
-  UnusedISR,                                          /* TIM1 Capture Compare          */
-  UnusedISR,                                          /* TIM2                          */
-  UnusedISR,                                          /* TIM3                          */
-  UnusedISR,                                          /* TIM4                          */
-  UnusedISR,                                          /* I2C1 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* I2C2 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* SPI1                          */
-  UnusedISR,                                          /* SPI2                          */
-  UnusedISR,                                          /* USART1                        */
-  UnusedISR,                                          /* USART2                        */
-  UnusedISR,                                          /* USART3                        */
-  UnusedISR,                                          /* EXTI Line 15..10              */
-  UnusedISR,                                          /* RTC alarm through EXTI line   */
-  UnusedISR,                                          /* USB OTG FS Wakeup             */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* TIM5                          */
-  UnusedISR,                                          /* SPI3                          */
-  UnusedISR,                                          /* UART4                         */
-  UnusedISR,                                          /* UART5                         */
-  UnusedISR,                                          /* TIM6                          */
-  UnusedISR,                                          /* TIM7                          */
-  UnusedISR,                                          /* DMA2 Channel1                 */
-  UnusedISR,                                          /* DMA2 Channel2                 */
-  UnusedISR,                                          /* DMA2 Channel3                 */
-  UnusedISR,                                          /* DMA2 Channel4                 */
-  UnusedISR,                                          /* DMA2 Channel5                 */
-  UnusedISR,                                          /* Ethernet                      */
-  UnusedISR,                                          /* Ethernet Wakeup               */
-  UnusedISR,                                          /* CAN2 TX                       */
-  UnusedISR,                                          /* CAN2 RX0                      */
-  UnusedISR,                                          /* CAN2 RX1                      */
-  UnusedISR,                                          /* CAN2 SCE                      */
-  UnusedISR,                                          /* USB OTG FS                    */
-  (void*)0x55AA11EE,                                  /* Reserved for OpenBLT checksum */
+  { reset_handler                  },                 /* the reset handler             */
+  { UnusedISR                      },                 /* NMI Handler                   */
+  { UnusedISR                      },                 /* Hard Fault Handler            */
+  { UnusedISR                      },                 /* MPU Fault Handler             */
+  { UnusedISR                      },                 /* Bus Fault Handler             */
+  { UnusedISR                      },                 /* Usage Fault Handler           */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* SVCall Handler                */
+  { UnusedISR                      },                 /* Debug Monitor Handler         */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* PendSV Handler                */
+  { TimerISRHandler                },                 /* SysTick Handler               */
+  { UnusedISR                      },                 /* Window Watchdog               */
+  { UnusedISR                      },                 /* PVD through EXTI Line detect  */
+  { UnusedISR                      },                 /* Tamper                        */
+  { UnusedISR                      },                 /* RTC                           */
+  { UnusedISR                      },                 /* Flash                         */
+  { UnusedISR                      },                 /* RCC                           */
+  { UnusedISR                      },                 /* EXTI Line 0                   */
+  { UnusedISR                      },                 /* EXTI Line 1                   */
+  { UnusedISR                      },                 /* EXTI Line 2                   */
+  { UnusedISR                      },                 /* EXTI Line 3                   */
+  { UnusedISR                      },                 /* EXTI Line 4                   */
+  { UnusedISR                      },                 /* DMA1 Channel 1                */
+  { UnusedISR                      },                 /* DMA1 Channel 2                */
+  { UnusedISR                      },                 /* DMA1 Channel 3                */
+  { UnusedISR                      },                 /* DMA1 Channel 4                */
+  { UnusedISR                      },                 /* DMA1 Channel 5                */
+  { UnusedISR                      },                 /* DMA1 Channel 6                */
+  { UnusedISR                      },                 /* DMA1 Channel 7                */
+  { UnusedISR                      },                 /* ADC1 and ADC2                 */
+  { UnusedISR                      },                 /* CAN1 TX                       */
+  { UnusedISR                      },                 /* CAN1 RX0                      */
+  { UnusedISR                      },                 /* CAN1 RX1                      */
+  { UnusedISR                      },                 /* CAN1 SCE                      */
+  { UnusedISR                      },                 /* EXTI Line 9..5                */
+  { UnusedISR                      },                 /* TIM1 Break                    */
+  { UnusedISR                      },                 /* TIM1 Update                   */
+  { UnusedISR                      },                 /* TIM1 Trigger and Commutation  */
+  { UnusedISR                      },                 /* TIM1 Capture Compare          */
+  { UnusedISR                      },                 /* TIM2                          */
+  { UnusedISR                      },                 /* TIM3                          */
+  { UnusedISR                      },                 /* TIM4                          */
+  { UnusedISR                      },                 /* I2C1 Event                    */
+  { UnusedISR                      },                 /* I2C1 Error                    */
+  { UnusedISR                      },                 /* I2C2 Event                    */
+  { UnusedISR                      },                 /* I2C1 Error                    */
+  { UnusedISR                      },                 /* SPI1                          */
+  { UnusedISR                      },                 /* SPI2                          */
+  { UnusedISR                      },                 /* USART1                        */
+  { UnusedISR                      },                 /* USART2                        */
+  { UnusedISR                      },                 /* USART3                        */
+  { UnusedISR                      },                 /* EXTI Line 15..10              */
+  { UnusedISR                      },                 /* RTC alarm through EXTI line   */
+  { UnusedISR                      },                 /* USB OTG FS Wakeup             */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* Reserved                      */
+  { UnusedISR                      },                 /* TIM5                          */
+  { UnusedISR                      },                 /* SPI3                          */
+  { UnusedISR                      },                 /* UART4                         */
+  { UnusedISR                      },                 /* UART5                         */
+  { UnusedISR                      },                 /* TIM6                          */
+  { UnusedISR                      },                 /* TIM7                          */
+  { UnusedISR                      },                 /* DMA2 Channel1                 */
+  { UnusedISR                      },                 /* DMA2 Channel2                 */
+  { UnusedISR                      },                 /* DMA2 Channel3                 */
+  { UnusedISR                      },                 /* DMA2 Channel4                 */
+  { UnusedISR                      },                 /* DMA2 Channel5                 */
+  { UnusedISR                      },                 /* Ethernet                      */
+  { UnusedISR                      },                 /* Ethernet Wakeup               */
+  { UnusedISR                      },                 /* CAN2 TX                       */
+  { UnusedISR                      },                 /* CAN2 RX0                      */
+  { UnusedISR                      },                 /* CAN2 RX1                      */
+  { UnusedISR                      },                 /* CAN2 SCE                      */
+  { UnusedISR                      },                 /* USB OTG FS                    */
+  { (void*)0x55AA11EE              },                 /* Reserved for OpenBLT checksum */
 };
 
 
diff --git a/Target/Source/ARMCM3_STM32/GCC/vectors.c b/Target/Source/ARMCM3_STM32/GCC/vectors.c
index 454df040..7ea3ecbe 100644
--- a/Target/Source/ARMCM3_STM32/GCC/vectors.c
+++ b/Target/Source/ARMCM3_STM32/GCC/vectors.c
@@ -70,89 +70,89 @@ __attribute__ ((section(".isr_vector")))
 const tIsrFunc _vectab[] =
 {
   { .ptr = (blt_int32u)&_estack },                    /* the initial stack pointer     */
-  reset_handler,                                      /* the reset handler             */
-  UnusedISR,                                          /* NMI Handler                   */
-  UnusedISR,                                          /* Hard Fault Handler            */
-  UnusedISR,                                          /* MPU Fault Handler             */
-  UnusedISR,                                          /* Bus Fault Handler             */
-  UnusedISR,                                          /* Usage Fault Handler           */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* SVCall Handler                */
-  UnusedISR,                                          /* Debug Monitor Handler         */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* PendSV Handler                */
-  UnusedISR,                                          /* SysTick Handler               */
-  UnusedISR,                                          /* Window Watchdog               */
-  UnusedISR,                                          /* PVD through EXTI Line detect  */
-  UnusedISR,                                          /* Tamper                        */
-  UnusedISR,                                          /* RTC                           */
-  UnusedISR,                                          /* Flash                         */
-  UnusedISR,                                          /* RCC                           */
-  UnusedISR,                                          /* EXTI Line 0                   */
-  UnusedISR,                                          /* EXTI Line 1                   */
-  UnusedISR,                                          /* EXTI Line 2                   */
-  UnusedISR,                                          /* EXTI Line 3                   */
-  UnusedISR,                                          /* EXTI Line 4                   */
-  UnusedISR,                                          /* DMA1 Channel 1                */
-  UnusedISR,                                          /* DMA1 Channel 2                */
-  UnusedISR,                                          /* DMA1 Channel 3                */
-  UnusedISR,                                          /* DMA1 Channel 4                */
-  UnusedISR,                                          /* DMA1 Channel 5                */
-  UnusedISR,                                          /* DMA1 Channel 6                */
-  UnusedISR,                                          /* DMA1 Channel 7                */
-  UnusedISR,                                          /* ADC1 and ADC2                 */
-  UnusedISR,                                          /* CAN1 TX                       */
-  UnusedISR,                                          /* CAN1 RX0                      */
-  UnusedISR,                                          /* CAN1 RX1                      */
-  UnusedISR,                                          /* CAN1 SCE                      */
-  UnusedISR,                                          /* EXTI Line 9..5                */
-  UnusedISR,                                          /* TIM1 Break                    */
-  UnusedISR,                                          /* TIM1 Update                   */
-  UnusedISR,                                          /* TIM1 Trigger and Commutation  */
-  UnusedISR,                                          /* TIM1 Capture Compare          */
-  UnusedISR,                                          /* TIM2                          */
-  UnusedISR,                                          /* TIM3                          */
-  UnusedISR,                                          /* TIM4                          */
-  UnusedISR,                                          /* I2C1 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* I2C2 Event                    */
-  UnusedISR,                                          /* I2C1 Error                    */
-  UnusedISR,                                          /* SPI1                          */
-  UnusedISR,                                          /* SPI2                          */
-  UnusedISR,                                          /* USART1                        */
-  UnusedISR,                                          /* USART2                        */
-  UnusedISR,                                          /* USART3                        */
-  UnusedISR,                                          /* EXTI Line 15..10              */
-  UnusedISR,                                          /* RTC alarm through EXTI line   */
-  UnusedISR,                                          /* USB OTG FS Wakeup             */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* Reserved                      */
-  UnusedISR,                                          /* TIM5                          */
-  UnusedISR,                                          /* SPI3                          */
-  UnusedISR,                                          /* UART4                         */
-  UnusedISR,                                          /* UART5                         */
-  UnusedISR,                                          /* TIM6                          */
-  UnusedISR,                                          /* TIM7                          */
-  UnusedISR,                                          /* DMA2 Channel1                 */
-  UnusedISR,                                          /* DMA2 Channel2                 */
-  UnusedISR,                                          /* DMA2 Channel3                 */
-  UnusedISR,                                          /* DMA2 Channel4                 */
-  UnusedISR,                                          /* DMA2 Channel5                 */
-  UnusedISR,                                          /* Ethernet                      */
-  UnusedISR,                                          /* Ethernet Wakeup               */
-  UnusedISR,                                          /* CAN2 TX                       */
-  UnusedISR,                                          /* CAN2 RX0                      */
-  UnusedISR,                                          /* CAN2 RX1                      */
-  UnusedISR,                                          /* CAN2 SCE                      */
-  UnusedISR                                           /* USB OTG FS                    */
+  { reset_handler               },                    /* the reset handler             */
+  { UnusedISR                   },                    /* NMI Handler                   */
+  { UnusedISR                   },                    /* Hard Fault Handler            */
+  { UnusedISR                   },                    /* MPU Fault Handler             */
+  { UnusedISR                   },                    /* Bus Fault Handler             */
+  { UnusedISR                   },                    /* Usage Fault Handler           */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* SVCall Handler                */
+  { UnusedISR                   },                    /* Debug Monitor Handler         */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* PendSV Handler                */
+  { UnusedISR                   },                    /* SysTick Handler               */
+  { UnusedISR                   },                    /* Window Watchdog               */
+  { UnusedISR                   },                    /* PVD through EXTI Line detect  */
+  { UnusedISR                   },                    /* Tamper                        */
+  { UnusedISR                   },                    /* RTC                           */
+  { UnusedISR                   },                    /* Flash                         */
+  { UnusedISR                   },                    /* RCC                           */
+  { UnusedISR                   },                    /* EXTI Line 0                   */
+  { UnusedISR                   },                    /* EXTI Line 1                   */
+  { UnusedISR                   },                    /* EXTI Line 2                   */
+  { UnusedISR                   },                    /* EXTI Line 3                   */
+  { UnusedISR                   },                    /* EXTI Line 4                   */
+  { UnusedISR                   },                    /* DMA1 Channel 1                */
+  { UnusedISR                   },                    /* DMA1 Channel 2                */
+  { UnusedISR                   },                    /* DMA1 Channel 3                */
+  { UnusedISR                   },                    /* DMA1 Channel 4                */
+  { UnusedISR                   },                    /* DMA1 Channel 5                */
+  { UnusedISR                   },                    /* DMA1 Channel 6                */
+  { UnusedISR                   },                    /* DMA1 Channel 7                */
+  { UnusedISR                   },                    /* ADC1 and ADC2                 */
+  { UnusedISR                   },                    /* CAN1 TX                       */
+  { UnusedISR                   },                    /* CAN1 RX0                      */
+  { UnusedISR                   },                    /* CAN1 RX1                      */
+  { UnusedISR                   },                    /* CAN1 SCE                      */
+  { UnusedISR                   },                    /* EXTI Line 9..5                */
+  { UnusedISR                   },                    /* TIM1 Break                    */
+  { UnusedISR                   },                    /* TIM1 Update                   */
+  { UnusedISR                   },                    /* TIM1 Trigger and Commutation  */
+  { UnusedISR                   },                    /* TIM1 Capture Compare          */
+  { UnusedISR                   },                    /* TIM2                          */
+  { UnusedISR                   },                    /* TIM3                          */
+  { UnusedISR                   },                    /* TIM4                          */
+  { UnusedISR                   },                    /* I2C1 Event                    */
+  { UnusedISR                   },                    /* I2C1 Error                    */
+  { UnusedISR                   },                    /* I2C2 Event                    */
+  { UnusedISR                   },                    /* I2C1 Error                    */
+  { UnusedISR                   },                    /* SPI1                          */
+  { UnusedISR                   },                    /* SPI2                          */
+  { UnusedISR                   },                    /* USART1                        */
+  { UnusedISR                   },                    /* USART2                        */
+  { UnusedISR                   },                    /* USART3                        */
+  { UnusedISR                   },                    /* EXTI Line 15..10              */
+  { UnusedISR                   },                    /* RTC alarm through EXTI line   */
+  { UnusedISR                   },                    /* USB OTG FS Wakeup             */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* Reserved                      */
+  { UnusedISR                   },                    /* TIM5                          */
+  { UnusedISR                   },                    /* SPI3                          */
+  { UnusedISR                   },                    /* UART4                         */
+  { UnusedISR                   },                    /* UART5                         */
+  { UnusedISR                   },                    /* TIM6                          */
+  { UnusedISR                   },                    /* TIM7                          */
+  { UnusedISR                   },                    /* DMA2 Channel1                 */
+  { UnusedISR                   },                    /* DMA2 Channel2                 */
+  { UnusedISR                   },                    /* DMA2 Channel3                 */
+  { UnusedISR                   },                    /* DMA2 Channel4                 */
+  { UnusedISR                   },                    /* DMA2 Channel5                 */
+  { UnusedISR                   },                    /* Ethernet                      */
+  { UnusedISR                   },                    /* Ethernet Wakeup               */
+  { UnusedISR                   },                    /* CAN2 TX                       */
+  { UnusedISR                   },                    /* CAN2 RX0                      */
+  { UnusedISR                   },                    /* CAN2 RX1                      */
+  { UnusedISR                   },                    /* CAN2 SCE                      */
+  { UnusedISR                   }                     /* USB OTG FS                    */
 };