diff --git a/g3/server.cc b/g3/server.cc
index f099295..f4e3489 100644
--- a/g3/server.cc
+++ b/g3/server.cc
@@ -698,7 +698,7 @@
       if (found == headers->end()) {
         (*headers)[element.name_string()] = element.value();
       } else {
-        found->second += ",";
+        found->second += ',';
         found->second += element.value();
       }
     }
diff --git a/tlbmc/store/octeon10_evk_store.cc b/tlbmc/store/octeon10_evk_store.cc
index 1e50b66..caec0c6 100644
--- a/tlbmc/store/octeon10_evk_store.cc
+++ b/tlbmc/store/octeon10_evk_store.cc
@@ -36,7 +36,6 @@
 #include "threshold_config.pb.h"
 #include "topology_config.pb.h"
 #include "tlbmc/credentials/credential_manager.h"
-#include "tlbmc/host_state/power_control.h"
 #include "fru.pb.h"
 #include "power_fault_log_entry.pb.h"
 #include "resource.pb.h"
diff --git a/tlbmc/store/store.h b/tlbmc/store/store.h
index 7a3280c..64c27e1 100644
--- a/tlbmc/store/store.h
+++ b/tlbmc/store/store.h
@@ -34,7 +34,6 @@
 #include "power_control.pb.h"
 #include "topology_config.pb.h"
 #include "tlbmc/credentials/credential_manager.h"
-#include "tlbmc/host_state/power_control.h"
 #include "fru.pb.h"
 #include "power_fault_log_entry.pb.h"
 #include "software_metrics.pb.h"
diff --git a/tlbmc/store/store_impl.cc b/tlbmc/store/store_impl.cc
index f196291..c09acb5 100644
--- a/tlbmc/store/store_impl.cc
+++ b/tlbmc/store/store_impl.cc
@@ -1219,13 +1219,13 @@
   }
 }
 
-void StoreImpl::StartSensorCollection() {
+void StoreImpl::StartSensorCollection() const {
   if (all_collectors_.sensor_collector_aggregator != nullptr) {
     all_collectors_.sensor_collector_aggregator->StartSensorCollection();
   }
 }
 
-void StoreImpl::StartThermalCollection() {
+void StoreImpl::StartThermalCollection() const {
   if (all_collectors_.thermal_collector != nullptr) {
     all_collectors_.thermal_collector->StartCollection();
   }
diff --git a/tlbmc/store/store_impl.h b/tlbmc/store/store_impl.h
index 09b1a9c..b0a63ba 100644
--- a/tlbmc/store/store_impl.h
+++ b/tlbmc/store/store_impl.h
@@ -267,10 +267,10 @@
       const std::string& service_name) const override;
 
   // Starts the sensor collector's collection.
-  void StartSensorCollection();
+  void StartSensorCollection() const;
 
   // Starts the thermal collector's collection if it is not null.
-  void StartThermalCollection();
+  void StartThermalCollection() const;
 
   // Enable/Disable fan manual mode for all thermal zones.
   void SetManualMode(bool enable_manual_mode) override;