diff --git a/fsw/platform_inc/cf_platform_cfg.h b/fsw/platform_inc/cf_platform_cfg.h
index 45b597234..b9e15e0a4 100644
--- a/fsw/platform_inc/cf_platform_cfg.h
+++ b/fsw/platform_inc/cf_platform_cfg.h
@@ -43,7 +43,7 @@
  ** \par Limits
  **         Must be one of uint8, uint16, uint32, uint64.
  */
-typedef uint8 CF_EntityId_t;
+typedef uint32 CF_EntityId_t;
 
 /**
  ** \cfcfg transaction sequence number size
diff --git a/fsw/src/cf_msg.h b/fsw/src/cf_msg.h
index 4026e616b..de65db696 100644
--- a/fsw/src/cf_msg.h
+++ b/fsw/src/cf_msg.h
@@ -227,7 +227,8 @@ typedef struct CF_TransactionCmd
     CFE_MSG_CommandHeader_t cmd_header;
     CF_TransactionSeq_t     ts;
     CF_EntityId_t           eid;
-    uint8                   chan; /* if 254, use ts. if 255, all channels */
+    uint8                   chan;     /* if 254, use ts. if 255, all channels */
+    uint8                   spare[3]; /* To make structure a multiple of uint32 */
 } CF_TransactionCmd_t;
 
 #endif /* !CF_MSG_H */