diff --git a/os/common/ports/ARMv6-M-RP2/chcore.h b/os/common/ports/ARMv6-M-RP2/chcore.h
index 9273fe890..a97936bd9 100644
--- a/os/common/ports/ARMv6-M-RP2/chcore.h
+++ b/os/common/ports/ARMv6-M-RP2/chcore.h
@@ -643,7 +643,7 @@ __STATIC_INLINE uint32_t port_get_core_id(void) {
 __STATIC_INLINE void port_notify_instance(os_instance_t *oip) {
 
   (void)oip;
-
+#if 0
   /* Waiting for space into the FIFO.*/
   while ((SIO->FIFO_ST & SIO_FIFO_ST_RDY) == 0U) {
     __WFE();
@@ -653,6 +653,7 @@ __STATIC_INLINE void port_notify_instance(os_instance_t *oip) {
      just discarded by the ISR, it is meant to just trigger a reschedule
      check.*/
   SIO->FIFO_WR = 0xFFFFFFFFU;
+#endif
 }
 
 #endif /* !defined(_FROM_ASM_) */
diff --git a/os/common/ports/ARMv6-M-RP2/compilers/GCC/chtypes.h b/os/common/ports/ARMv6-M-RP2/compilers/GCC/chtypes.h
index 2163f3d48..6b336f1d9 100644
--- a/os/common/ports/ARMv6-M-RP2/compilers/GCC/chtypes.h
+++ b/os/common/ports/ARMv6-M-RP2/compilers/GCC/chtypes.h
@@ -21,7 +21,7 @@
  * @file    ARMCMx/compilers/GCC/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
- * @addtogroup ARMCMx_GCC_CORE
+ * @addtogroup ARMv6_M_RP2_GCC_CORE
  * @{
  */
 
diff --git a/os/common/ports/ARMv6-M/compilers/GCC/chtypes.h b/os/common/ports/ARMv6-M/compilers/GCC/chtypes.h
index 2163f3d48..db1f418f8 100644
--- a/os/common/ports/ARMv6-M/compilers/GCC/chtypes.h
+++ b/os/common/ports/ARMv6-M/compilers/GCC/chtypes.h
@@ -21,7 +21,7 @@
  * @file    ARMCMx/compilers/GCC/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
- * @addtogroup ARMCMx_GCC_CORE
+ * @addtogroup ARMv6_M_GCC_CORE
  * @{
  */
 
diff --git a/os/common/ports/ARMv7-M/compilers/GCC/chtypes.h b/os/common/ports/ARMv7-M/compilers/GCC/chtypes.h
index 2163f3d48..2a2262023 100644
--- a/os/common/ports/ARMv7-M/compilers/GCC/chtypes.h
+++ b/os/common/ports/ARMv7-M/compilers/GCC/chtypes.h
@@ -21,7 +21,7 @@
  * @file    ARMCMx/compilers/GCC/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
- * @addtogroup ARMCMx_GCC_CORE
+ * @addtogroup ARMv7_M_GCC_CORE
  * @{
  */
 
diff --git a/os/common/ports/ARMv7-M/compilers/IAR/chtypes.h b/os/common/ports/ARMv7-M/compilers/IAR/chtypes.h
index 93a80b224..b223a8f2f 100644
--- a/os/common/ports/ARMv7-M/compilers/IAR/chtypes.h
+++ b/os/common/ports/ARMv7-M/compilers/IAR/chtypes.h
@@ -21,7 +21,7 @@
  * @file    ARMCMx/compilers/IAR/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
- * @addtogroup ARMCMx_IAR_CORE
+ * @addtogroup ARMv7_M_IAR_CORE
  * @{
  */
 
diff --git a/os/common/ports/ARMv7-M/compilers/RVCT/chtypes.h b/os/common/ports/ARMv7-M/compilers/RVCT/chtypes.h
index 53bb3e220..76a099154 100644
--- a/os/common/ports/ARMv7-M/compilers/RVCT/chtypes.h
+++ b/os/common/ports/ARMv7-M/compilers/RVCT/chtypes.h
@@ -21,7 +21,7 @@
  * @file    ARMCMx/compilers/RVCT/chtypes.h
  * @brief   ARM Cortex-Mx port system types.
  *
- * @addtogroup ARMCMx_RVCT_CORE
+ * @addtogroup ARMv7_M_RVCT_CORE
  * @{
  */