diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 21ad78a7..8f21a408 100644
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -127,7 +127,7 @@ void AdvanceDestBuffer(OEMCrypto_DestBufferDesc* dest_buffer, size_t bytes) {
       return;
   }
   LOGE("Unrecognized OEMCryptoBufferType %u - doing nothing",
-       dest_buffer->type);
+       static_cast<unsigned int>(dest_buffer->type));
 }
 
 bool GetGenericSigningAlgorithm(CdmSigningAlgorithm algorithm,
diff --git a/libwvdrmengine/cdm/core/src/initialization_data.cpp b/libwvdrmengine/cdm/core/src/initialization_data.cpp
index 1ff2b082..fbacf1a8 100644
--- a/libwvdrmengine/cdm/core/src/initialization_data.cpp
+++ b/libwvdrmengine/cdm/core/src/initialization_data.cpp
@@ -700,8 +700,9 @@ void InitializationData::DumpToLogs() const {
   }
   if (pssh.has_protection_scheme()) {
     uint32_t scheme = pssh.protection_scheme();
-    LOGD("InitData: Protection Scheme: %c%c%c%c", (scheme >> 24) & 0xFF,
-         (scheme >> 16) & 0xFF, (scheme >> 8) & 0xFF, (scheme >> 0) & 0xFF);
+    LOGD("InitData: Protection Scheme: %c%c%c%c",
+         static_cast<char>(scheme >> 24), static_cast<char>(scheme >> 16),
+         static_cast<char>(scheme >> 8), static_cast<char>(scheme >> 0));
   }
   switch (pssh.type()) {
     case video_widevine::WidevinePsshData_Type_SINGLE:
diff --git a/libwvdrmengine/cdm/util/include/log.h b/libwvdrmengine/cdm/util/include/log.h
index 3a95662c..5d945e4e 100644
--- a/libwvdrmengine/cdm/util/include/log.h
+++ b/libwvdrmengine/cdm/util/include/log.h
@@ -35,7 +35,7 @@ CORE_UTIL_EXPORT void InitLogging();
 
 // Only enable format specifier warnings on LP64 systems.  There is
 // no easy portable method to handle format specifiers for int64_t.
-#if (defined(__gnuc__) || defined(__clang__)) && defined(__LP64__)
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__LP64__)
 [[gnu::format(printf, 5, 6)]] CORE_UTIL_EXPORT void Log(const char* file,
                                                         const char* function,
                                                         int line,
diff --git a/libwvdrmengine/cdm/util/src/string_conversions.cpp b/libwvdrmengine/cdm/util/src/string_conversions.cpp
index 3bdb68ae..cd93dbbd 100644
--- a/libwvdrmengine/cdm/util/src/string_conversions.cpp
+++ b/libwvdrmengine/cdm/util/src/string_conversions.cpp
@@ -56,12 +56,12 @@ std::vector<uint8_t> a2b_hex(const std::string& byte) {
     return array;
   }
 
-  for (unsigned int i = 0; i < count / 2; ++i) {
+  for (size_t i = 0; i < count / 2; ++i) {
     unsigned char msb = 0;  // most significant 4 bits
     unsigned char lsb = 0;  // least significant 4 bits
     if (!DecodeHexChar(byte[i * 2], &msb) ||
         !DecodeHexChar(byte[i * 2 + 1], &lsb)) {
-      LOGE("Invalid hex value %c%c at index %d", byte[i * 2], byte[i * 2 + 1],
+      LOGE("Invalid hex value %c%c at index %zu", byte[i * 2], byte[i * 2 + 1],
            i);
       return array;
     }