diff --git a/fsw/src/hk_utils.c b/fsw/src/hk_utils.c
index 8e77f6b..13b0d65 100644
--- a/fsw/src/hk_utils.c
+++ b/fsw/src/hk_utils.c
@@ -77,7 +77,7 @@ void HK_ProcessIncomingHkData(const CFE_SB_Buffer_t *BufPtr)
                 DestPtr = ((uint8 *)RtTblEntry->OutputPktAddr) + CpyTblEntry->OutputOffset;
                 SrcPtr  = ((uint8 *)BufPtr) + CpyTblEntry->InputOffset;
 
-                CFE_PSP_MemCpy(DestPtr, SrcPtr, CpyTblEntry->NumBytes);
+                memcpy(DestPtr, SrcPtr, CpyTblEntry->NumBytes);
 
                 /* Set the data present field to indicate the data is there */
                 RtTblEntry->DataPresent = HK_DATA_PRESENT;
diff --git a/unit-test/utilities/hk_test_utils.c b/unit-test/utilities/hk_test_utils.c
index eec4fe0..8d81028 100644
--- a/unit-test/utilities/hk_test_utils.c
+++ b/unit-test/utilities/hk_test_utils.c
@@ -180,7 +180,7 @@ void HK_Test_Setup(void)
     /* initialize test environment to default state for every test */
     UT_ResetState(0);
 
-    memset(&HK_AppData, 0, sizeof(HK_AppData_t));
+    memset(&HK_AppData, 0, sizeof(HK_AppData));
     memset(context_CFE_EVS_SendEvent, 0, sizeof(context_CFE_EVS_SendEvent));
     memset(&context_CFE_ES_WriteToSysLog, 0, sizeof(context_CFE_ES_WriteToSysLog));