diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index b5289cbdeb..d2fc443aa4 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -32,12 +32,13 @@
 #include "wiring.h"
 
 /* sketch */
-extern void setup( void ) ;
-extern void loop( void ) ;
 
 #ifdef __cplusplus
 extern "C"{
 #endif // __cplusplus
+extern void setup( void ) ;
+extern void loop( void ) ;
+
 void yield(void);
 #ifdef __cplusplus
 } // extern "C"
diff --git a/cores/arduino/stm32/clock.c b/cores/arduino/stm32/clock.c
index 9317f98c88..f5ee4d2de4 100644
--- a/cores/arduino/stm32/clock.c
+++ b/cores/arduino/stm32/clock.c
@@ -125,6 +125,11 @@ uint32_t GetCurrentMilli(void)
   return HAL_GetTick();
 }
 
+void noOsSystickHandler(){
+
+}
+
+void osSystickHandler() __attribute__((weak, alias("noOsSystickHandler")));
 /**
   * @brief  Function called when t he tick interruption falls
   * @param  None
@@ -134,6 +139,7 @@ void SysTick_Handler(void)
 {
   HAL_IncTick();
   HAL_SYSTICK_IRQHandler();
+  osSystickHandler();
 }
 
 /**
diff --git a/platform.txt b/platform.txt
index 7798f9c0e0..2a84f1c412 100644
--- a/platform.txt
+++ b/platform.txt
@@ -109,10 +109,10 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 tools.massStorageCopy.cmd=massStorageCopy
 tools.massStorageCopy.cmd.windows=massStorageCopy.bat
 tools.massStorageCopy.cmd.macosx=massStorageCopyMacOsX
-tools.massStorageCopy.path={runtime.hardware.path}/tools/win
-tools.massStorageCopy.path.macosx={runtime.hardware.path}/tools/macosx
-tools.massStorageCopy.path.linux={runtime.hardware.path}/tools/linux
-tools.massStorageCopy.path.linux64={runtime.hardware.path}/tools/linux
+tools.massStorageCopy.path={runtime.tools.STM32Tools.path}/tools/win
+tools.massStorageCopy.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
+tools.massStorageCopy.path.linux={runtime.tools.STM32Tools.path}/tools/linux
+tools.massStorageCopy.path.linux64={runtime.tools.STM32Tools.path}/tools/linux
 tools.massStorageCopy.upload.params.verbose=
 tools.massStorageCopy.upload.params.quiet=
 tools.massStorageCopy.upload.pattern="{path}/{cmd}" {upload.verbose} -I "{build.path}/{build.project_name}.bin" -O "{node}"
@@ -120,10 +120,10 @@ tools.massStorageCopy.upload.pattern="{path}/{cmd}" {upload.verbose} -I "{build.
 # stlink upload
 tools.stlink_upload.cmd=stlink_upload
 tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
-tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
+tools.stlink_upload.path.windows={runtime.tools.STM32Tools.path}/tools/win
+tools.stlink_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
+tools.stlink_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux
+tools.stlink_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64
 tools.stlink_upload.upload.params.verbose=-d
 tools.stlink_upload.upload.params.quiet=
 tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"