diff --git a/os/rt/ports/ARM/compilers/GCC/chtypes.h b/os/rt/ports/ARM/compilers/GCC/chtypes.h
index 88e9956ed..5ea352765 100644
--- a/os/rt/ports/ARM/compilers/GCC/chtypes.h
+++ b/os/rt/ports/ARM/compilers/GCC/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
index c500da63b..0bbcd5dbe 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/ports/ARMCMx/compilers/IAR/chtypes.h b/os/rt/ports/ARMCMx/compilers/IAR/chtypes.h
index 4e41e4c6d..2078217da 100644
--- a/os/rt/ports/ARMCMx/compilers/IAR/chtypes.h
+++ b/os/rt/ports/ARMCMx/compilers/IAR/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/ports/ARMCMx/compilers/RVCT/chtypes.h b/os/rt/ports/ARMCMx/compilers/RVCT/chtypes.h
index a8e92db6f..ce846a912 100644
--- a/os/rt/ports/ARMCMx/compilers/RVCT/chtypes.h
+++ b/os/rt/ports/ARMCMx/compilers/RVCT/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/ports/e200/chcore.h b/os/rt/ports/e200/chcore.h
index 63d566df2..ffac96bea 100644
--- a/os/rt/ports/e200/chcore.h
+++ b/os/rt/ports/e200/chcore.h
@@ -60,7 +60,7 @@
 #define PORT_COMPILER_NAME              "GCC " __VERSION__
 
 #elif defined(__MWERKS__)
-#define PORT_COMPILER_NAME              "CW " __VERSION__
+#define PORT_COMPILER_NAME              "CW"
 
 #else
 #error "unsupported compiler"
diff --git a/os/rt/ports/e200/compilers/CW/chtypes.h b/os/rt/ports/e200/compilers/CW/chtypes.h
index b0a8de4e2..e0fa7f6b3 100644
--- a/os/rt/ports/e200/compilers/CW/chtypes.h
+++ b/os/rt/ports/e200/compilers/CW/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/ports/e200/compilers/GCC/chtypes.h b/os/rt/ports/e200/compilers/GCC/chtypes.h
index 2973f8ef8..38d4fd59e 100644
--- a/os/rt/ports/e200/compilers/GCC/chtypes.h
+++ b/os/rt/ports/e200/compilers/GCC/chtypes.h
@@ -50,18 +50,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/rt/templates/chtypes.h b/os/rt/templates/chtypes.h
index 68fef3a19..56cfcb783 100644
--- a/os/rt/templates/chtypes.h
+++ b/os/rt/templates/chtypes.h
@@ -54,18 +54,6 @@
 #endif
 /** @} */
 
-/**
- * @name    Derived generic types
- * @{
- */
-typedef volatile int8_t     vint8_t;        /**< Volatile signed 8 bits.    */
-typedef volatile uint8_t    vuint8_t;       /**< Volatile unsigned 8 bits.  */
-typedef volatile int16_t    vint16_t;       /**< Volatile signed 16 bits.   */
-typedef volatile uint16_t   vuint16_t;      /**< Volatile unsigned 16 bits. */
-typedef volatile int32_t    vint32_t;       /**< Volatile signed 32 bits.   */
-typedef volatile uint32_t   vuint32_t;      /**< Volatile unsigned 32 bits. */
-/** @} */
-
 /**
  * @name    Kernel types
  * @{
diff --git a/os/various/shell.c b/os/various/shell.c
index 4c2f3c6cd..0de6f449a 100644
--- a/os/various/shell.c
+++ b/os/various/shell.c
@@ -119,7 +119,7 @@ static bool cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,
                       char *name, int argc, char *argv[]) {
 
   while (scp->sc_name != NULL) {
-    if (strcasecmp(scp->sc_name, name) == 0) {
+    if (strcmp(scp->sc_name, name) == 0) {
       scp->sc_function(chp, argc, argv);
       return false;
     }
@@ -161,14 +161,14 @@ static THD_FUNCTION(shell_thread, p) {
     }
     args[n] = NULL;
     if (cmd != NULL) {
-      if (strcasecmp(cmd, "exit") == 0) {
+      if (strcmp(cmd, "exit") == 0) {
         if (n > 0) {
           usage(chp, "exit");
           continue;
         }
         break;
       }
-      else if (strcasecmp(cmd, "help") == 0) {
+      else if (strcmp(cmd, "help") == 0) {
         if (n > 0) {
           usage(chp, "help");
           continue;