diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index 6a115c2df4..4ca9b9df09 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -851,7 +851,7 @@ void GenericGap::on_read_phy(
 )
 {
     ble_error_t status = BLE_ERROR_NONE;
-    if (pal::hci_error_code_t::SUCCESS != hci_status) {
+    if (hci_status != pal::hci_error_code_t::SUCCESS) {
         status = BLE_ERROR_UNSPECIFIED;
     }
 
@@ -868,7 +868,7 @@ void GenericGap::on_phy_update_complete(
 )
 {
     ble_error_t status = BLE_ERROR_NONE;
-    if (pal::hci_error_code_t::SUCCESS != hci_status) {
+    if (hci_status != pal::hci_error_code_t::SUCCESS) {
         status = BLE_ERROR_UNSPECIFIED;
     }
 
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp
index a957deb40c..0fc482c4d6 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp
@@ -730,7 +730,7 @@ bool CordioSecurityManager::sm_handler(const wsfMsgHdr_t* msg) {
         case DM_SEC_ECC_KEY_IND: {
             secEccMsg_t* evt = (secEccMsg_t*) msg;
             DmSecSetEccKey(&evt->data.key);
-            memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(_public_key_x));
+            memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(self._public_key_x));
             self._lesc_keys_generated = true;
             return true;
         }
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/cordio_stack/wsf/common/include/wsf_types.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/cordio_stack/wsf/common/include/wsf_types.h
index 8e48be050e..88f755ac33 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/cordio_stack/wsf/common/include/wsf_types.h
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/cordio_stack/wsf/common/include/wsf_types.h
@@ -58,7 +58,7 @@ extern "C" {
 /**@{*/
 #if ((defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) && \
      (!defined(__ICC8051__) || (__ICC8051__ == 0))) || \
-     defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
+     defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) || defined(__ARMCC_VERSION)
 
 #include <stdint.h>
 #else