diff --git a/connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt b/connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt
index 59e07538b54d..992388a3540a 100644
--- a/connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt
+++ b/connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("CORDIO_ZERO_COPY_HCI=1" IN_LIST MBED_CONFIG_DEFINITIONS)
+if("CORDIO_ZERO_COPY_HCI" IN_LIST MBED_CONFIG_DEFINITIONS)
     set(TEST_SKIPPED "Test not relevant for zero copy hci.")
 endif()
 
diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
index 338f9c59ce84..320d13c896fc 100644
--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@@ -488,6 +488,7 @@ struct GattClient::DiscoveryControlBlock final : public ProcedureControlBlock {
     bool done;
 };
 
+#undef TRACE_CLASS
 #define TRACE_CLASS "ReadControlBlock"
 struct GattClient::ReadControlBlock final : public ProcedureControlBlock {
     using ProcedureControlBlock::connection_handle;
@@ -701,6 +702,7 @@ struct GattClient::ReadControlBlock final : public ProcedureControlBlock {
 /*
  * Control block for the write process
  */
+#undef TRACE_CLASS
 #define TRACE_CLASS "WriteControlBlock"
 struct GattClient::WriteControlBlock final : public ProcedureControlBlock {
     using ProcedureControlBlock::connection_handle;
@@ -926,6 +928,7 @@ struct GattClient::WriteControlBlock final : public ProcedureControlBlock {
 /*
  * Control block for the descriptor discovery process
  */
+#undef TRACE_CLASS
 #define TRACE_CLASS "DescriptorDiscoveryControlBlock"
 struct GattClient::DescriptorDiscoveryControlBlock final : public ProcedureControlBlock {
     using ProcedureControlBlock::connection_handle;
diff --git a/rtos/tests/TESTS/mbed_rtos/mutex/main.cpp b/rtos/tests/TESTS/mbed_rtos/mutex/main.cpp
index 52705edf910c..7afadc3d65db 100644
--- a/rtos/tests/TESTS/mbed_rtos/mutex/main.cpp
+++ b/rtos/tests/TESTS/mbed_rtos/mutex/main.cpp
@@ -58,7 +58,6 @@ volatile bool mutex_defect = false;
 bool manipulate_protected_zone(const Kernel::Clock::duration thread_delay)
 {
     bool result = true;
-    osStatus stat;
 
     stdio_mutex.lock();
 
@@ -128,7 +127,6 @@ void test_multiple_threads(void)
 
 void test_dual_thread_nolock_lock_thread(Mutex *mutex)
 {
-    osStatus stat;
     mutex->lock();
 
     mutex->unlock();
@@ -184,7 +182,6 @@ void test_dual_thread_lock_unlock_thread(Mutex *mutex)
 void test_dual_thread_lock_unlock(void)
 {
     Mutex mutex;
-    osStatus stat;
     Thread thread(osPriorityNormal, TEST_STACK_SIZE);
 
     mutex.lock();
@@ -230,7 +227,6 @@ template <void (*F)(Mutex *)>
 void test_dual_thread_lock(void)
 {
     Mutex mutex;
-    osStatus stat;
     Thread thread(osPriorityNormal, TEST_STACK_SIZE);
 
     mutex.lock();
@@ -251,7 +247,6 @@ void test_dual_thread_lock(void)
 void test_single_thread_lock_recursive(void)
 {
     Mutex mutex;
-    osStatus stat;
 
     mutex.lock();
 
@@ -287,7 +282,6 @@ void test_single_thread_trylock(void)
 void test_single_thread_lock(void)
 {
     Mutex mutex;
-    osStatus stat;
 
     mutex.lock();