diff --git a/message.hpp b/message.hpp
index b486c77..7902b1e 100644
--- a/message.hpp
+++ b/message.hpp
@@ -168,7 +168,7 @@
     {
         uint32_t command = 0;
 
-        command |= (static_cast<uint8_t>(payloadType) << 16);
+        command |= (static_cast<uint32_t>(payloadType) << 16);
         if (payloadType == PayloadType::IPMI)
         {
             auto request =
diff --git a/message_handler.hpp b/message_handler.hpp
index 37e7240..f0d4848 100644
--- a/message_handler.hpp
+++ b/message_handler.hpp
@@ -148,10 +148,10 @@
 
     parser::SessionHeader sessionHeader = parser::SessionHeader::IPMI20;
 
-    std::shared_ptr<message::Message> inMessage;
+    std::shared_ptr<message::Message> inMessage{};
 
     /** @brief The IPMI session of the handler */
-    std::shared_ptr<session::Session> session;
+    std::shared_ptr<session::Session> session{};
 };
 
 } // namespace message