diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
index f22a9e366..bd87717c4 100644
--- a/fsw/cfe-core/src/es/cfe_es_api.c
+++ b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -867,7 +867,7 @@ int32 CFE_ES_GetAppName(char *AppName, CFE_ES_AppId_t AppId, size_t BufferLength
    int32 Result;
    CFE_ES_AppRecord_t *AppRecPtr;
 
-   if (BufferLength == 0 || AppName == NULL)
+   if (BufferLength == 0 || AppName == NULL || BufferLength > OS_MAX_API_NAME)
    {
        return CFE_ES_BAD_ARGUMENT;
    }
@@ -1737,19 +1737,12 @@ int32 CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *CDSHandlePtr, size_t BlockSize, con
     /* Check to make sure calling application is legit */
     Status = CFE_ES_GetAppID(&ThisAppId);
 
-    if ( Status != CFE_SUCCESS || CDSHandlePtr == NULL || Name == NULL)  /* Application ID was invalid */
+    if (CDSHandlePtr == NULL || Name == NULL)  /* Application ID was invalid */
     {
       CFE_ES_WriteToSysLog("CFE_ES_RegisterCDS:-Failed invalid arguments\n");
       Status = CFE_ES_BAD_ARGUMENT;
     }
     else
-    {
-        /* Initialize output to safe value, in case this fails */
-        *CDSHandlePtr = CFE_ES_RESOURCEID_UNDEFINED;
-
-        /* Check to make sure calling application is legit */
-        Status = CFE_ES_GetAppID(&ThisAppId);
-
         if ( Status != CFE_SUCCESS )  /* Application ID was invalid */
         {
             CFE_ES_WriteToSysLog("CFE_CDS:Register-Bad AppId context\n");
diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c
index bd4908ef3..b60f4e8f2 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_api.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_api.c
@@ -2081,6 +2081,12 @@ CFE_SB_Buffer_t *CFE_SB_ZeroCopyGetPtr(size_t MsgSize,
    CFE_SB_ZeroCopyD_t  *zcd = NULL;
    CFE_SB_BufferD_t    *bd = NULL;
 
+    if(MsgSize > CFE_MISSION_SB_MAX_SB_MSG_SIZE)
+    {
+        CFE_ES_WriteToSysLog(" CFE_SB:ZeroCopyGetPtr-Failed, MsgSize is too large\n");
+        return NULL;
+    }
+
     CFE_SB_LockSharedData(__func__,__LINE__);
 
     /* Allocate a new zero copy descriptor from the SB memory pool.*/
diff --git a/fsw/cfe-core/src/sb/cfe_sb_util.c b/fsw/cfe-core/src/sb/cfe_sb_util.c
index 119c067b7..e8501a49b 100644
--- a/fsw/cfe-core/src/sb/cfe_sb_util.c
+++ b/fsw/cfe-core/src/sb/cfe_sb_util.c
@@ -160,7 +160,13 @@ void CFE_SB_SetUserDataLength(CFE_MSG_Message_t *MsgPtr, size_t DataLength)
         HdrSize = CFE_SB_MsgHdrSize(MsgPtr);
         TotalMsgSize = HdrSize + DataLength;
     
-        CFE_MSG_SetSize(MsgPtr, TotalMsgSize);
+        if(TotalMsgSize <= CFE_MISSION_SB_MAX_SB_MSG_SIZE){
+            CFE_MSG_SetSize(MsgPtr, TotalMsgSize);
+        }
+        else
+        {
+            CFE_ES_WriteToSysLog("CFE_SB:SetUserDataLength-Failed TotalMsgSize too large\n");  
+        }   
     }
 }/* end CFE_SB_SetUserDataLength */