diff --git a/hal/mbed_ticker_api.c b/hal/mbed_ticker_api.c
index 8f7a97ca54c..03a7765ccff 100644
--- a/hal/mbed_ticker_api.c
+++ b/hal/mbed_ticker_api.c
@@ -44,7 +44,7 @@ static void initialize(const ticker_data_t *ticker)
 
     uint8_t frequency_shifts = 0;
     for (uint8_t i = 31; i > 0; --i) {
-        if ((1 << i) == frequency) {
+        if ((1U << i) == frequency) {
             frequency_shifts = i;
             break;
         }
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_handlers.c b/rtos/TARGET_CORTEX/mbed_rtx_handlers.c
index 223874e4e52..33204e61908 100644
--- a/rtos/TARGET_CORTEX/mbed_rtx_handlers.c
+++ b/rtos/TARGET_CORTEX/mbed_rtx_handlers.c
@@ -41,8 +41,6 @@ __NO_RETURN void osRtxIdleThread (void *argument)
 
 __NO_RETURN uint32_t osRtxErrorNotify (uint32_t code, void *object_id)
 {
-    osThreadId_t tid = osThreadGetId();
-
     switch (code) {
       case osRtxErrorStackUnderflow:
         // Stack underflow detected for thread (thread_id=object_id)