diff --git a/fsw/cfe-core/src/inc/cfe_msg_typedefs.h b/fsw/cfe-core/src/inc/cfe_msg_typedefs.h
index 34ad63351..89a81f345 100644
--- a/fsw/cfe-core/src/inc/cfe_msg_typedefs.h
+++ b/fsw/cfe-core/src/inc/cfe_msg_typedefs.h
@@ -76,7 +76,7 @@ typedef enum
 {
     CFE_MSG_Endian_Invalid, /**< \brief Invalid endian setting */
     CFE_MSG_Endian_Big,     /**< \brief Big endian */
-    CFE_MSG_Endian_Little   /**< \brief Littne endian */
+    CFE_MSG_Endian_Little   /**< \brief Little endian */
 } CFE_MSG_Endian_t;
 
 /** \brief Playback flag */
diff --git a/modules/msg/private_inc/cfe_msg_defaults.h b/modules/msg/private_inc/cfe_msg_defaults.h
index 5105d5e81..ab1541672 100644
--- a/modules/msg/private_inc/cfe_msg_defaults.h
+++ b/modules/msg/private_inc/cfe_msg_defaults.h
@@ -36,7 +36,7 @@
  * Defines
  */
 
-/* Backwards compatibility - TODO could just force users to define */
+/* Backwards compatibility */
 #ifndef CFE_PLATFORM_DEFAULT_APID
 #define CFE_PLATFORM_DEFAULT_APID 0 /**< \brief Default APID, for bits not in MsgId */
 #endif
diff --git a/modules/msg/src/cfe_msg_sechdr_checksum.c b/modules/msg/src/cfe_msg_sechdr_checksum.c
index 8fe35b17e..aa645c864 100644
--- a/modules/msg/src/cfe_msg_sechdr_checksum.c
+++ b/modules/msg/src/cfe_msg_sechdr_checksum.c
@@ -37,14 +37,14 @@ CFE_MSG_Checksum_t CFE_MSG_ComputeCheckSum(const CFE_MSG_Message_t *MsgPtr)
 
     uint32             PktLen  = 0;
     const uint8 *      BytePtr = MsgPtr->Byte;
-    CFE_MSG_Checksum_t chksum  = 0;
+    CFE_MSG_Checksum_t chksum  = 0xFF;
 
-    if (CFE_MSG_GetSize(MsgPtr, &PktLen) == CFE_SUCCESS)
-    {
-        chksum = 0xFF;
+    /* Message already checked, no error case reachable */
+    CFE_MSG_GetSize(MsgPtr, &PktLen);
 
-        while (PktLen--)
-            chksum ^= *(BytePtr++);
+    while (PktLen--)
+    {
+        chksum ^= *(BytePtr++);
     }
 
     return chksum;