diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index 6456ca1..849f678 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -708,11 +708,13 @@
 
             if (warningHigh != warningMap.end())
             {
-                warningHighAlarm = warningHigh->second.get<bool>();
+                warningHighAlarm = sdbusplus::message::variant_ns::get<bool>(
+                    warningHigh->second);
             }
             if (warningLow != warningMap.end())
             {
-                warningLowAlarm = warningLow->second.get<bool>();
+                warningLowAlarm = sdbusplus::message::variant_ns::get<bool>(
+                    warningLow->second);
             }
             if (warningHighAlarm)
             {
@@ -735,11 +737,13 @@
 
             if (criticalHigh != criticalMap.end())
             {
-                criticalHighAlarm = criticalHigh->second.get<bool>();
+                criticalHighAlarm = sdbusplus::message::variant_ns::get<bool>(
+                    criticalHigh->second);
             }
             if (criticalLow != criticalMap.end())
             {
-                criticalLowAlarm = criticalLow->second.get<bool>();
+                criticalLowAlarm = sdbusplus::message::variant_ns::get<bool>(
+                    criticalLow->second);
             }
             if (criticalHighAlarm)
             {
diff --git a/src/utils.cpp b/src/utils.cpp
index 3851e82..27c25de 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -122,7 +122,8 @@
         objectInfo = std::make_pair(object.first, object.second.begin()->first);
 
         // if LinkLocalIP found look for Non-LinkLocalIP
-        if (ipmi::network::isLinkLocalIP(variant.get<std::string>()))
+        if (ipmi::network::isLinkLocalIP(
+                sdbusplus::message::variant_ns::get<std::string>(variant)))
         {
             continue;
         }
