diff --git a/libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp b/libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp
index 04d949afe..4b8533628 100644
--- a/libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp
+++ b/libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp
@@ -22,7 +22,7 @@ XpuptiActivityApi& XpuptiActivityApi::singleton() {
 
 void XpuptiActivityApi::pushCorrelationID(int id, CorrelationFlowType type) {
 #ifdef HAS_XPUPTI
-  if (!singleton().externalCorrelationEnabled_) {
+  if (!externalCorrelationEnabled_) {
     return;
   }
   switch (type) {
@@ -39,7 +39,7 @@ void XpuptiActivityApi::pushCorrelationID(int id, CorrelationFlowType type) {
 
 void XpuptiActivityApi::popCorrelationID(CorrelationFlowType type) {
 #ifdef HAS_XPUPTI
-  if (!singleton().externalCorrelationEnabled_) {
+  if (!externalCorrelationEnabled_) {
     return;
   }
   switch (type) {
diff --git a/libkineto/src/plugin/xpupti/XpuptiActivityApi.h b/libkineto/src/plugin/xpupti/XpuptiActivityApi.h
index 1d423046e..6e10e34c3 100644
--- a/libkineto/src/plugin/xpupti/XpuptiActivityApi.h
+++ b/libkineto/src/plugin/xpupti/XpuptiActivityApi.h
@@ -28,22 +28,22 @@ class XpuptiActivityApi {
   XpuptiActivityApi(const XpuptiActivityApi&) = delete;
   XpuptiActivityApi& operator=(const XpuptiActivityApi&) = delete;
 
-  virtual ~XpuptiActivityApi() {}
+  ~XpuptiActivityApi() = default;
 
   static XpuptiActivityApi& singleton();
 
-  static void pushCorrelationID(int id, CorrelationFlowType type);
-  static void popCorrelationID(CorrelationFlowType type);
+  void pushCorrelationID(int id, CorrelationFlowType type);
+  void popCorrelationID(CorrelationFlowType type);
 
   void enableXpuptiActivities(const std::set<ActivityType>& selected_activities);
   void disablePtiActivities(const std::set<ActivityType>& selected_activities);
   void clearActivities();
   void flushActivities();
 
-  virtual std::unique_ptr<XpuptiActivityBufferMap> activityBuffers();
+  std::unique_ptr<XpuptiActivityBufferMap> activityBuffers();
 
-  virtual const std::pair<int, int> processActivities(XpuptiActivityBufferMap&,
-                                                      std::function<void(const pti_view_record_base*)> handler);
+  const std::pair<int, int> processActivities(XpuptiActivityBufferMap&,
+                                              std::function<void(const pti_view_record_base*)> handler);
 
  private:
   XpuptiActivityBufferMap allocatedGpuTraceBuffers_;