diff --git a/src/crypto/CHIPCryptoPALPSA.cpp b/src/crypto/CHIPCryptoPALPSA.cpp
index 15ad26fff01c41..b4dfdf96577012 100644
--- a/src/crypto/CHIPCryptoPALPSA.cpp
+++ b/src/crypto/CHIPCryptoPALPSA.cpp
@@ -1773,7 +1773,7 @@ CHIP_ERROR ExtractRawDNFromX509Cert(bool extractSubject, const ByteSpan & certif
     dn.reduce_size(len);
 
 exit:
-    _log_mbedTLS_error(result);
+    logMbedTLSError(result);
     mbedtls_x509_crt_free(&mbedCertificate);
 
 #else
diff --git a/src/platform/Ameba/BLEManagerImpl.cpp b/src/platform/Ameba/BLEManagerImpl.cpp
index 2cb77beb3e9c7e..b45c314446e095 100644
--- a/src/platform/Ameba/BLEManagerImpl.cpp
+++ b/src/platform/Ameba/BLEManagerImpl.cpp
@@ -292,7 +292,12 @@ CHIP_ERROR BLEManagerImpl::HandleGAPDisconnect(uint16_t conn_id, uint16_t disc_c
         disconReason = BLE_ERROR_CHIPOBLE_PROTOCOL_ABORT;
         break;
     }
-    HandleConnectionError(conn_id, disconReason);
+
+    ChipDeviceEvent event;
+    event.Type                           = DeviceEventType::kCHIPoBLEConnectionError;
+    event.CHIPoBLEConnectionError.ConId  = conn_id;
+    event.CHIPoBLEConnectionError.Reason = disconReason;
+    PlatformMgr().PostEventOrDie(&event);
 
     // Force a reconfiguration of advertising in case we switched to non-connectable mode when
     // the BLE connection was established.
diff --git a/src/setup_payload/AdditionalDataPayload.h b/src/setup_payload/AdditionalDataPayload.h
index 9614d08579016a..ede62352fadd45 100644
--- a/src/setup_payload/AdditionalDataPayload.h
+++ b/src/setup_payload/AdditionalDataPayload.h
@@ -34,6 +34,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace chip {