diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index b105cf5b..0713b65a 100644
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -1841,7 +1841,7 @@ CdmResponseType CryptoSession::CreateUsageTableHeader(
 
   usage_table_header->resize(kEstimatedInitialUsageTableHeader);
 
-  uint32_t usage_table_header_size = usage_table_header->size();
+  size_t usage_table_header_size = usage_table_header->size();
   OEMCryptoResult result = OEMCrypto_CreateUsageTableHeader(
       requested_security_level_,
       reinterpret_cast<uint8_t*>(const_cast<char*>(usage_table_header->data())),
diff --git a/libwvdrmengine/cdm/metrics/include/event_metric.h b/libwvdrmengine/cdm/metrics/include/event_metric.h
index 1e1ca33e..f9179b64 100644
--- a/libwvdrmengine/cdm/metrics/include/event_metric.h
+++ b/libwvdrmengine/cdm/metrics/include/event_metric.h
@@ -95,7 +95,7 @@ class Pow2Bucket {
       value >>= 1;
     }
 
-    return 1 << (log - 1);
+    return 1u << (log - 1);
   }
 
   size_t value_;
diff --git a/libwvdrmengine/cdm/metrics/test/event_metric_test.cpp b/libwvdrmengine/cdm/metrics/test/event_metric_test.cpp
index 21722617..4c372c84 100644
--- a/libwvdrmengine/cdm/metrics/test/event_metric_test.cpp
+++ b/libwvdrmengine/cdm/metrics/test/event_metric_test.cpp
@@ -209,11 +209,11 @@ TEST_F(EventMetricTest, Pow2BucketTest) {
   EXPECT_EQ("2", value.str());
 
   value.str("");
-  value << Pow2Bucket(0xFFFFFFFF);
+  value << Pow2Bucket(0xFFFFFFFFu);
   EXPECT_EQ("2147483648", value.str());
 
   value.str("");
-  value << Pow2Bucket(0x80000000);
+  value << Pow2Bucket(0x80000000u);
   EXPECT_EQ("2147483648", value.str());
 
   value.str("");
@@ -223,4 +223,3 @@ TEST_F(EventMetricTest, Pow2BucketTest) {
 
 }  // namespace metrics
 }  // namespace wvcdm
-
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
index a60a6dad..b82c65de 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
@@ -30,7 +30,7 @@ namespace wvoec_mock {
 CryptoEngine::CryptoEngine(wvcdm::FileSystem* file_system)
     : root_of_trust_(config_provisioning_method()),
       file_system_(file_system),
-      usage_table_(this, file_system) {
+      usage_table_(this) {
   ERR_load_crypto_strings();
 }
 
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
index efac08fd..0afc00c9 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
@@ -79,9 +79,8 @@ class UsageTableEntry {
 
 class UsageTable {
  public:
-  UsageTable(CryptoEngine* ce, wvcdm::FileSystem* file_system)
-      : ce_(ce), file_system_(file_system), header_loaded_(false),
-        old_table_(NULL){};
+  explicit UsageTable(CryptoEngine* ce)
+      : ce_(ce), header_loaded_(false), old_table_(NULL){};
   ~UsageTable();
 
   OEMCryptoResult CreateNewUsageEntry(SessionContext* session,
@@ -124,7 +123,6 @@ class UsageTable {
   bool LoadGenerationNumber(bool or_make_new_one);
 
   CryptoEngine* ce_;
-  wvcdm::FileSystem* file_system_;
   bool header_loaded_;
   int64_t master_generation_number_;
   std::vector<int64_t> generation_numbers_;
diff --git a/libwvdrmengine/oemcrypto/test/oec_session_util.h b/libwvdrmengine/oemcrypto/test/oec_session_util.h
index 5b63732a..bc60baa6 100644
--- a/libwvdrmengine/oemcrypto/test/oec_session_util.h
+++ b/libwvdrmengine/oemcrypto/test/oec_session_util.h
@@ -107,7 +107,7 @@ struct RSAPrivateKeyMessage {
 struct Test_PST_Report {
   Test_PST_Report(const std::string& pst_in,
                   OEMCrypto_Usage_Entry_Status status_in)
-      : pst(pst_in), status(status_in) {}
+      : status(status_in), pst(pst_in) {}
 
   OEMCrypto_Usage_Entry_Status status;
   int64_t seconds_since_license_received;
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 49a888c4..296c4950 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -5426,13 +5426,11 @@ TEST_F(UsageTableTest, TimingTest) {
                                                   loaded1,
                                                   first_decrypt1,
                                                   second_decrypt));
-  time_t report_generated2 = time(NULL);
   ASSERT_NO_FATAL_FAILURE(s2.UpdateUsageEntry(&encrypted_usage_header_));
   ASSERT_NO_FATAL_FAILURE(s2.GenerateVerifyReport(pst2, kActive,
                                                   loaded2,
                                                   first_decrypt2,
                                                   third_decrypt));
-  time_t report_generated3 = time(NULL);
   ASSERT_NO_FATAL_FAILURE(s3.UpdateUsageEntry(&encrypted_usage_header_));
   ASSERT_NO_FATAL_FAILURE(s3.GenerateVerifyReport(pst3, kUnused, loaded3));
 }