diff --git a/src/source/PeerConnection/PeerConnection.c b/src/source/PeerConnection/PeerConnection.c
index 327d43eba7..cfa9b3791e 100644
--- a/src/source/PeerConnection/PeerConnection.c
+++ b/src/source/PeerConnection/PeerConnection.c
@@ -522,6 +522,7 @@ VOID onIceConnectionStateChange(UINT64 customData, UINT64 connectionState)
     CHK_LOG_ERR(retStatus);
 }
 
+#ifdef ENABLE_KVS_THREADPOOL
 STATUS peerConnectionAsync(startRoutine fn, PVOID data)
 {
     STATUS retStatus = STATUS_SUCCESS;
@@ -530,6 +531,7 @@ STATUS peerConnectionAsync(startRoutine fn, PVOID data)
 
     return retStatus;
 }
+#endif
 
 VOID onNewIceLocalCandidate(UINT64 customData, PCHAR candidateSdpStr)
 {
@@ -1908,6 +1910,7 @@ STATUS peerConnectionGetMetrics(PRtcPeerConnection pPeerConnection, PPeerConnect
         pPeerConnectionMetrics->version = PEER_CONNECTION_METRICS_CURRENT_VERSION;
     }
 
+#ifdef ENABLE_KVS_THREADPOOL
     MUTEX_LOCK(pWebRtcClientContext->stunCtxlock);
     if (pWebRtcClientContext->isContextInitialized) {
         if (pWebRtcClientContext->pStunIpAddrCtx->isIpInitialized) {
@@ -1915,7 +1918,7 @@ STATUS peerConnectionGetMetrics(PRtcPeerConnection pPeerConnection, PPeerConnect
         }
     }
     MUTEX_UNLOCK(pWebRtcClientContext->stunCtxlock);
-
+#endif
     pPeerConnectionMetrics->peerConnectionStats.peerConnectionCreationTime = pKvsPeerConnection->peerConnectionDiagnostics.peerConnectionCreationTime;
     pPeerConnectionMetrics->peerConnectionStats.dtlsSessionSetupTime = pKvsPeerConnection->peerConnectionDiagnostics.dtlsSessionSetupTime;
     pPeerConnectionMetrics->peerConnectionStats.iceHolePunchingTime = pKvsPeerConnection->peerConnectionDiagnostics.iceHolePunchingTime;
diff --git a/src/source/Signaling/LwsApiCalls.c b/src/source/Signaling/LwsApiCalls.c
index b696157da7..be2a8510e1 100644
--- a/src/source/Signaling/LwsApiCalls.c
+++ b/src/source/Signaling/LwsApiCalls.c
@@ -2396,7 +2396,6 @@ PVOID receiveLwsMessageWrapper(PVOID args)
         CHK_STATUS(pSignalingClient->signalingClientCallbacks.messageReceivedFn(pSignalingClient->signalingClientCallbacks.customData,
                                                                                 &pSignalingMessageWrapper->receivedSignalingMessage));
     }
-
 CleanUp:
     CHK_LOG_ERR(retStatus);