diff --git a/src/ipmiblob/blob_handler.cpp b/src/ipmiblob/blob_handler.cpp
index 2b79e19..039b7e0 100644
--- a/src/ipmiblob/blob_handler.cpp
+++ b/src/ipmiblob/blob_handler.cpp
@@ -48,7 +48,7 @@
 
     std::copy(ipmiPhosphorOen.begin(), ipmiPhosphorOen.end(),
               std::back_inserter(request));
-    request.push_back(command);
+    request.push_back(static_cast<std::uint8_t>(command));
 
     if (payload.size() > 0)
     {
diff --git a/src/ipmiblob/blob_handler.hpp b/src/ipmiblob/blob_handler.hpp
index 5e24b91..68708d8 100644
--- a/src/ipmiblob/blob_handler.hpp
+++ b/src/ipmiblob/blob_handler.hpp
@@ -11,21 +11,6 @@
 class BlobHandler : public BlobInterface
 {
   public:
-    enum BlobOEMCommands
-    {
-        bmcBlobGetCount = 0,
-        bmcBlobEnumerate = 1,
-        bmcBlobOpen = 2,
-        bmcBlobRead = 3,
-        bmcBlobWrite = 4,
-        bmcBlobCommit = 5,
-        bmcBlobClose = 6,
-        bmcBlobDelete = 7,
-        bmcBlobStat = 8,
-        bmcBlobSessionStat = 9,
-        bmcBlobWriteMeta = 10,
-    };
-
     /**
      * Create a BlobInterface pointer for use given an ipmi handler.
      *
diff --git a/src/ipmiblob/blob_interface.hpp b/src/ipmiblob/blob_interface.hpp
index 26ca837..fbd8c6a 100644
--- a/src/ipmiblob/blob_interface.hpp
+++ b/src/ipmiblob/blob_interface.hpp
@@ -7,6 +7,21 @@
 namespace ipmiblob
 {
 
+enum class BlobOEMCommands : std::uint8_t
+{
+    bmcBlobGetCount = 0,
+    bmcBlobEnumerate = 1,
+    bmcBlobOpen = 2,
+    bmcBlobRead = 3,
+    bmcBlobWrite = 4,
+    bmcBlobCommit = 5,
+    bmcBlobClose = 6,
+    bmcBlobDelete = 7,
+    bmcBlobStat = 8,
+    bmcBlobSessionStat = 9,
+    bmcBlobWriteMeta = 10,
+};
+
 struct StatResponse
 {
     std::uint16_t blob_state;