diff --git a/fsw/cfe-core/src/time/cfe_time_task.c b/fsw/cfe-core/src/time/cfe_time_task.c
index 0f7ef3a50..a080c516a 100644
--- a/fsw/cfe-core/src/time/cfe_time_task.c
+++ b/fsw/cfe-core/src/time/cfe_time_task.c
@@ -427,10 +427,10 @@ int32 CFE_TIME_TaskInit(void)
 **  Return:
 **    true if length is acceptable
 */
-bool CFE_TIME_VerifyCmdLength(CFE_SB_MsgPtr_t Msg, uint16 ExpectedLength)
+bool CFE_TIME_VerifyCmdLength(CFE_SB_MsgPtr_t Msg, size_t ExpectedLength)
 {
     bool    result       = true;
-    uint16  ActualLength = CFE_SB_GetTotalMsgLength(Msg);
+    size_t  ActualLength = CFE_SB_GetTotalMsgLength(Msg);
 
     /*
     ** Verify the command packet length
diff --git a/fsw/cfe-core/src/time/cfe_time_utils.h b/fsw/cfe-core/src/time/cfe_time_utils.h
index d89f19350..bb0ee47f5 100644
--- a/fsw/cfe-core/src/time/cfe_time_utils.h
+++ b/fsw/cfe-core/src/time/cfe_time_utils.h
@@ -62,7 +62,7 @@
 */
 #define CFE_TIME_TASK_TONE_NAME  "TIME_TONE_TASK"
 #define CFE_TIME_TASK_1HZ_NAME   "TIME_1HZ_TASK"
-#define CFE_TIME_TASK_STACK_PTR  0
+#define CFE_TIME_TASK_STACK_PTR  CFE_ES_TASK_STACK_ALLOCATE
 #define CFE_TIME_TASK_FLAGS      0
 
 /*