diff --git a/src/chassiscommands.cpp b/src/chassiscommands.cpp
index 1ff29c2..360e787 100644
--- a/src/chassiscommands.cpp
+++ b/src/chassiscommands.cpp
@@ -512,7 +512,7 @@
     constexpr bool coolingFanFault = false;
     // chassisIdentifySupport set because this command is implemented
     constexpr bool chassisIdentifySupport = true;
-    uint2_t chassisIdentifyState = chassisIDState;
+    uint2_t chassisIdentifyState = types::enum_cast<uint2_t>(chassisIDState);
     constexpr bool sleepButtonDisabled = false;
     constexpr bool sleepButtonDisableAllow = false;
 
diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 46566a3..fe589de 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -741,14 +741,18 @@
     uint6_t cpu3CATERRCount = 0;
     uint6_t cpu4CATERRCount = 0;
     uint8_t crashdumpCount = 0;
-    uint2_t cpu1Status =
-        cpuPresent("CPU_1") ? CPUStatus::enabled : CPUStatus::notPresent;
-    uint2_t cpu2Status =
-        cpuPresent("CPU_2") ? CPUStatus::enabled : CPUStatus::notPresent;
-    uint2_t cpu3Status =
-        cpuPresent("CPU_3") ? CPUStatus::enabled : CPUStatus::notPresent;
-    uint2_t cpu4Status =
-        cpuPresent("CPU_4") ? CPUStatus::enabled : CPUStatus::notPresent;
+    uint2_t cpu1Status = cpuPresent("CPU_1")
+                             ? types::enum_cast<uint8_t>(CPUStatus::enabled)
+                             : types::enum_cast<uint8_t>(CPUStatus::notPresent);
+    uint2_t cpu2Status = cpuPresent("CPU_2")
+                             ? types::enum_cast<uint8_t>(CPUStatus::enabled)
+                             : types::enum_cast<uint8_t>(CPUStatus::notPresent);
+    uint2_t cpu3Status = cpuPresent("CPU_3")
+                             ? types::enum_cast<uint8_t>(CPUStatus::enabled)
+                             : types::enum_cast<uint8_t>(CPUStatus::notPresent);
+    uint2_t cpu4Status = cpuPresent("CPU_4")
+                             ? types::enum_cast<uint8_t>(CPUStatus::enabled)
+                             : types::enum_cast<uint8_t>(CPUStatus::notPresent);
 
     std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
     try