diff --git a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
index 19727e12..df02ec48 100644
--- a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
+++ b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
@@ -375,9 +375,9 @@ void EngineMetrics::ConsolidateSessions() {
 
   // TODO(b/118664842): Add support to merge older metrics into one
   // consolidated metric.
-  int excess_completed = completed_session_metrics_list_.size()
-                         - kMaxCompletedSessions;
-  if (excess_completed > 0) {
+  if (completed_session_metrics_list_.size() > kMaxCompletedSessions) {
+    const size_t excess_completed =
+        completed_session_metrics_list_.size() - kMaxCompletedSessions;
     completed_session_metrics_list_.erase(
         completed_session_metrics_list_.begin(),
         completed_session_metrics_list_.begin() + excess_completed);
diff --git a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
index 177e39ca..c55b8f69 100644
--- a/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
+++ b/libwvdrmengine/oemcrypto/odk/src/core_message_serialize.cpp
@@ -56,7 +56,7 @@ bool CreateResponse(uint32_t message_type, const S& core_request,
     return false;
   }
 
-  uint32_t message_length = ODK_Message_GetSize(&msg);
+  uint32_t message_length = static_cast<uint32_t>(ODK_Message_GetSize(&msg));
   msg = ODK_Message_Create(buf.data() + sizeof(header->message_type),
                            sizeof(header->message_length));
   Pack_uint32_t(&msg, &message_length);
@@ -72,7 +72,7 @@ bool CopyDeviceId(const ODK_ProvisioningRequest& src,
   if (request.device_id_length > sizeof(request.device_id)) {
     return false;
   }
-  request.device_id_length = device_id.size();
+  request.device_id_length = static_cast<uint32_t>(device_id.size());
   memset(request.device_id, 0, sizeof(request.device_id));
   memcpy(request.device_id, device_id.data(), request.device_id_length);
   return true;
diff --git a/libwvdrmengine/oemcrypto/odk/src/serialization_base.c b/libwvdrmengine/oemcrypto/odk/src/serialization_base.c
index 3a0364c0..1ee62016 100644
--- a/libwvdrmengine/oemcrypto/odk/src/serialization_base.c
+++ b/libwvdrmengine/oemcrypto/odk/src/serialization_base.c
@@ -52,25 +52,25 @@ void Pack_bool(ODK_Message* message, const bool* value) {
 void Pack_uint16_t(ODK_Message* message, const uint16_t* value) {
   assert(value);
   uint8_t data[2] = {0};
-  data[0] = *value >> 8;
-  data[1] = *value >> 0;
+  data[0] = (uint8_t)(*value >> 8);
+  data[1] = (uint8_t)(*value >> 0);
   PackBytes(message, data, sizeof(data));
 }
 
 void Pack_uint32_t(ODK_Message* message, const uint32_t* value) {
   assert(value);
   uint8_t data[4] = {0};
-  data[0] = *value >> 24;
-  data[1] = *value >> 16;
-  data[2] = *value >> 8;
-  data[3] = *value >> 0;
+  data[0] = (uint8_t)(*value >> 24);
+  data[1] = (uint8_t)(*value >> 16);
+  data[2] = (uint8_t)(*value >> 8);
+  data[3] = (uint8_t)(*value >> 0);
   PackBytes(message, data, sizeof(data));
 }
 
 void Pack_uint64_t(ODK_Message* message, const uint64_t* value) {
   assert(value);
-  uint32_t hi = *value >> 32;
-  uint32_t lo = *value;
+  uint32_t hi = (uint32_t)(*value >> 32);
+  uint32_t lo = (uint32_t)(*value);
   Pack_uint32_t(message, &hi);
   Pack_uint32_t(message, &lo);
 }
@@ -104,7 +104,7 @@ static void UnpackBytes(ODK_Message* message, uint8_t* ptr, size_t count) {
 int Unpack_enum(ODK_Message* message) {
   uint32_t v32;
   Unpack_uint32_t(message, &v32);
-  return v32;
+  return (int)v32;
 }
 
 void Unpack_bool(ODK_Message* message, bool* value) {