diff --git a/libwvdrmengine/cdm/core/include/crypto_session.h b/libwvdrmengine/cdm/core/include/crypto_session.h
index cf817877..1473c000 100644
--- a/libwvdrmengine/cdm/core/include/crypto_session.h
+++ b/libwvdrmengine/cdm/core/include/crypto_session.h
@@ -198,6 +198,9 @@ class CryptoSession {
   static bool initialized_;
   static int session_count_;
 
+  metrics::MetricsGroup* metrics_;
+  metrics::TimerMetric life_span_;
+
   bool open_;
   CdmClientTokenType pre_provision_token_type_;
   bool update_usage_table_after_close_session_;
@@ -212,9 +215,6 @@ class CryptoSession {
   uint64_t request_id_base_;
   static uint64_t request_id_index_;
 
-  metrics::MetricsGroup* metrics_;
-  metrics::TimerMetric life_span_;
-
   CdmCipherMode cipher_mode_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp
index 11e7e700..662a57f7 100644
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -26,6 +26,7 @@ namespace wvcdm {
 
 CdmSession::CdmSession(FileSystem* file_system) :
     initialized_(false),
+    crypto_session_(new CryptoSession(&metrics_)),
     file_handle_(new DeviceFiles(file_system)),
     license_received_(false),
     is_offline_(false),
@@ -38,8 +39,7 @@ CdmSession::CdmSession(FileSystem* file_system) :
     is_initial_usage_update_(true),
     is_usage_update_needed_(false),
     mock_license_parser_in_use_(false),
-    mock_policy_engine_in_use_(false),
-    crypto_session_(new CryptoSession(&metrics_)) {
+    mock_policy_engine_in_use_(false) {
   life_span_.Start();
 }
 
diff --git a/libwvdrmengine/cdm/metrics/include/distribution.h b/libwvdrmengine/cdm/metrics/include/distribution.h
index c9a13d7e..9b42d395 100644
--- a/libwvdrmengine/cdm/metrics/include/distribution.h
+++ b/libwvdrmengine/cdm/metrics/include/distribution.h
@@ -31,11 +31,11 @@ class Distribution {
 
   // Return the value for each of the stats computed about the series of
   // values (min, max, count, etc.).
-  const double Min() { return min_; }
-  const double Max() { return max_; }
-  const double Mean() { return mean_; }
-  const int64_t Count() { return count_; }
-  const double Variance() {
+  double Min() const { return min_; }
+  double Max() const { return max_; }
+  double Mean() const { return mean_; }
+  int64_t Count() const { return count_; }
+  double Variance() const {
     return count_ == 0 ? 0.0 : sum_squared_deviation_ / count_;
   }
 
diff --git a/libwvdrmengine/cdm/metrics/include/event_metric.h b/libwvdrmengine/cdm/metrics/include/event_metric.h
index d0f5341b..1e1ca33e 100644
--- a/libwvdrmengine/cdm/metrics/include/event_metric.h
+++ b/libwvdrmengine/cdm/metrics/include/event_metric.h
@@ -220,9 +220,9 @@ std::string MakeFieldNameString(const std::vector<std::string>& field_names,
 // instances with no fields.
 template<>
 inline std::string MakeFieldNameString<Unused, Unused, Unused, Unused>(
-    const std::vector<std::string>& field_names,
-    const Unused unused1, const Unused unused2,
-    const Unused unused3, const Unused unused4) {
+    const std::vector<std::string>& /* field_names */,
+    const Unused /* unused1 */, const Unused /* unused2 */,
+    const Unused /* unused3 */, const Unused /* unused4 */) {
   return "";
 }