diff --git a/lib/jni/LogManager_jni.cpp b/lib/jni/LogManager_jni.cpp
index f832e1421..078973d2a 100644
--- a/lib/jni/LogManager_jni.cpp
+++ b/lib/jni/LogManager_jni.cpp
@@ -892,7 +892,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
     ManagerAndConfig const* mc;
     {
         std::lock_guard<std::mutex> lock(jniManagersMutex);
-        if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= jniManagers.size())
+        if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= static_cast<jlong>(jniManagers.size()))
         {
             return nullptr;
         }
@@ -914,7 +914,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
 {
     {
         std::lock_guard<std::mutex> lock(jniManagersMutex);
-        if (nativeLogManager < 0 || nativeLogManager >= jniManagers.size())
+        if (nativeLogManager < 0 || nativeLogManager >= static_cast<jlong>(jniManagers.size()))
         {
             return;
         }
@@ -971,7 +971,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
     ManagerAndConfig* mc;
     {
         std::lock_guard<std::mutex> lock(jniManagersMutex);
-        if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= jniManagers.size())
+        if (nativeLogManagerIndex < 0 || nativeLogManagerIndex >= static_cast<jlong>(jniManagers.size()))
         {
             return 0;
         }
@@ -997,7 +997,7 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
 static ILogManager* getLogManager(jlong nativeLogManager)
 {
     std::lock_guard<std::mutex> lock(jniManagersMutex);
-    if (nativeLogManager < 0 || nativeLogManager >= jniManagers.size())
+    if (nativeLogManager < 0 || nativeLogManager >= static_cast<jlong>(jniManagers.size()))
     {
         return nullptr;
     }
@@ -1587,7 +1587,8 @@ Java_com_microsoft_applications_events_LogManagerProvider_00024LogManagerImpl_na
     jlong eventType,
     jlong identity) {
     std::lock_guard<std::mutex> l(listeners_mutex);
-    if (identity < 0 || identity >= listeners.size() || !listeners[identity]) {
+    if (identity < 0 || identity >= static_cast<jlong>(jniManagers.size()) || !listeners[identity])
+    {
         return;
     }
     auto logManager = getLogManager(native_log_manager);
diff --git a/tests/common/SocketTools.hpp b/tests/common/SocketTools.hpp
index f06075e10..0bfe350d3 100644
--- a/tests/common/SocketTools.hpp
+++ b/tests/common/SocketTools.hpp
@@ -128,7 +128,7 @@ class SocketAddr
 #ifdef _WIN32
         INT addrlen = sizeof(m_data);
         WCHAR buf[200];
-        for(int i = 0; i < sizeof(buf) && addr[i]; i++)
+        for(size_t i = 0; i < sizeof(buf) && addr[i]; i++)
         {
             buf[i] = addr[i];
         }