diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
index 78b9cba29..e66bd661b 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16
+  USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
 endif
 
 # C specific options here (added to USE_OPT).
diff --git a/demos/various/SB-CLIENT-128k-08040000-16k-20018000/Makefile b/demos/various/SB-CLIENT-128k-08040000-16k-20018000/Makefile
index 7c44980aa..3aa73b5d0 100644
--- a/demos/various/SB-CLIENT-128k-08040000-16k-20018000/Makefile
+++ b/demos/various/SB-CLIENT-128k-08040000-16k-20018000/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer --specs=nano.specs
+  USE_OPT = -O2 -ggdb -fomit-frame-pointer --specs=nano.specs
 endif
 
 # C specific options here (added to USE_OPT).
diff --git a/demos/various/SB-CLIENT-128k-08040000-16k-20018000/cfg/chconf.h b/demos/various/SB-CLIENT-128k-08040000-16k-20018000/cfg/chconf.h
index a3ce6ea5e..1cd04f8dd 100644
--- a/demos/various/SB-CLIENT-128k-08040000-16k-20018000/cfg/chconf.h
+++ b/demos/various/SB-CLIENT-128k-08040000-16k-20018000/cfg/chconf.h
@@ -575,7 +575,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_STATISTICS)
-#define CH_DBG_STATISTICS                   TRUE
+#define CH_DBG_STATISTICS                   FALSE
 #endif
 
 /**
@@ -586,7 +586,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_SYSTEM_STATE_CHECK)
-#define CH_DBG_SYSTEM_STATE_CHECK           TRUE
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
 #endif
 
 /**
@@ -597,7 +597,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_CHECKS)
-#define CH_DBG_ENABLE_CHECKS                TRUE
+#define CH_DBG_ENABLE_CHECKS                FALSE
 #endif
 
 /**
@@ -609,7 +609,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_ASSERTS)
-#define CH_DBG_ENABLE_ASSERTS               TRUE
+#define CH_DBG_ENABLE_ASSERTS               FALSE
 #endif
 
 /**
@@ -619,7 +619,7 @@
  * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
  */
 #if !defined(CH_DBG_TRACE_MASK)
-#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_ALL
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
 #endif
 
 /**
@@ -654,7 +654,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_FILL_THREADS)
-#define CH_DBG_FILL_THREADS                 TRUE
+#define CH_DBG_FILL_THREADS                 FALSE
 #endif
 
 /**
diff --git a/demos/various/SB-CLIENT-128k-08060000-16k-2001C000/Makefile b/demos/various/SB-CLIENT-128k-08060000-16k-2001C000/Makefile
index 93d484378..61e04c968 100644
--- a/demos/various/SB-CLIENT-128k-08060000-16k-2001C000/Makefile
+++ b/demos/various/SB-CLIENT-128k-08060000-16k-2001C000/Makefile
@@ -5,7 +5,7 @@
 
 # Compiler options here.
 ifeq ($(USE_OPT),)
-  USE_OPT = -O0 -ggdb -fomit-frame-pointer --specs=nano.specs
+  USE_OPT = -O2 -ggdb -fomit-frame-pointer --specs=nano.specs
 endif
 
 # C specific options here (added to USE_OPT).
diff --git a/os/common/ports/ARMvx-M-SB/compilers/GCC/vectors.S b/os/common/ports/ARMvx-M-SB/compilers/GCC/vectors.S
index 12fe962f6..339022e32 100644
--- a/os/common/ports/ARMvx-M-SB/compilers/GCC/vectors.S
+++ b/os/common/ports/ARMvx-M-SB/compilers/GCC/vectors.S
@@ -61,7 +61,7 @@
         .bss
 
         .align      2
-        .globl      __sb_vectors
+        .globl      __sb_in_vrq
 __sb_in_vrq:
         .ds.l       1
 
diff --git a/os/hal/ports/sandbox/hal_sio_lld.c b/os/hal/ports/sandbox/hal_sio_lld.c
index 1651e62fe..954d88100 100644
--- a/os/hal/ports/sandbox/hal_sio_lld.c
+++ b/os/hal/ports/sandbox/hal_sio_lld.c
@@ -318,7 +318,7 @@ void sio_lld_update_enable_flags(SIODriver *siop) {
  */
 sioevents_t sio_lld_get_and_clear_errors(SIODriver *siop) {
 
-  __syscall2r(201, SB_VUART_GCERR, siop->nvuart);
+  __syscall2rr(201, SB_VUART_GCERR, siop->nvuart);
   osalDbgAssert((msg_t)r0 == HAL_RET_SUCCESS, "unexpected failure");
 
   return (sioevents_t)r1;
@@ -334,7 +334,7 @@ sioevents_t sio_lld_get_and_clear_errors(SIODriver *siop) {
  */
 sioevents_t sio_lld_get_and_clear_events(SIODriver *siop) {
 
-  __syscall2r(201, SB_VUART_GCEVT, siop->nvuart);
+  __syscall2rr(201, SB_VUART_GCEVT, siop->nvuart);
   osalDbgAssert((msg_t)r0 == HAL_RET_SUCCESS, "unexpected failure");
 
   return (sioevents_t)r1;
@@ -350,7 +350,7 @@ sioevents_t sio_lld_get_and_clear_events(SIODriver *siop) {
  */
 sioevents_t sio_lld_get_events(SIODriver *siop) {
 
-  __syscall2r(201, SB_VUART_GEVT, siop->nvuart);
+  __syscall2rr(201, SB_VUART_GEVT, siop->nvuart);
   osalDbgAssert((msg_t)r0 == HAL_RET_SUCCESS, "unexpected failure");
 
   return (sioevents_t)r1;