diff --git a/modules/es/ut-coverage/es_UT.c b/modules/es/ut-coverage/es_UT.c
index 68ae5b4e4..cf6915df4 100644
--- a/modules/es/ut-coverage/es_UT.c
+++ b/modules/es/ut-coverage/es_UT.c
@@ -4495,7 +4495,7 @@ void TestAPI(void)
 
     /* Force a vsnprintf failure */
     ES_ResetUnitTest();
-    UtAssert_VOIDCALL(ES_UT_SysLog_snprintf(SysLogBuf, sizeof(SysLogBuf), NULL));
+    UtAssert_VOIDCALL(ES_UT_SysLog_snprintf(SysLogBuf, sizeof(SysLogBuf), ""));
 
     /* Test run loop with an application error status */
     ES_ResetUnitTest();
diff --git a/modules/fs/ut-coverage/fs_UT.c b/modules/fs/ut-coverage/fs_UT.c
index 36ace51e8..5e19107aa 100644
--- a/modules/fs/ut-coverage/fs_UT.c
+++ b/modules/fs/ut-coverage/fs_UT.c
@@ -333,7 +333,7 @@ void Test_CFE_FS_ParseInputFileNameEx(void)
     UtAssert_INT32_EQ(
         CFE_FS_ParseInputFileNameEx(OutBuffer, "", sizeof(OutBuffer), 10, NULL, NULL, TEST_DEFAULT_EXTENSION),
         CFE_FS_INVALID_PATH);
-    UtAssert_INT32_EQ(CFE_FS_ParseInputFileNameEx(OutBuffer, "/path/", sizeof(OutBuffer), 10, NULL, TEST_DEFAULT_PATH,
+    UtAssert_INT32_EQ(CFE_FS_ParseInputFileNameEx(OutBuffer, "/path/", sizeof(OutBuffer), sizeof("/path/"), NULL, TEST_DEFAULT_PATH,
                                                   TEST_DEFAULT_EXTENSION),
                       CFE_FS_INVALID_PATH);
 
diff --git a/modules/sb/fsw/src/cfe_sb_api.c b/modules/sb/fsw/src/cfe_sb_api.c
index 1b9574260..51b98635d 100644
--- a/modules/sb/fsw/src/cfe_sb_api.c
+++ b/modules/sb/fsw/src/cfe_sb_api.c
@@ -1926,6 +1926,8 @@ CFE_Status_t CFE_SB_ReceiveBuffer(CFE_SB_Buffer_t **BufPtr, CFE_SB_PipeId_t Pipe
             {
                 --PipeDscPtr->CurrentQueueDepth;
             }
+            /* Should decrement the use count only if buffer is within bounds of allocated memory, for the ref that was in the queue */
+            CFE_SB_DecrBufUseCnt(BufDscPtr);
         }
         else
         {
@@ -1933,9 +1935,6 @@ CFE_Status_t CFE_SB_ReceiveBuffer(CFE_SB_Buffer_t **BufPtr, CFE_SB_PipeId_t Pipe
             PendingEventID = CFE_SB_BAD_PIPEID_EID;
             Status         = CFE_SB_PIPE_RD_ERR;
         }
-
-        /* Always decrement the use count, for the ref that was in the queue */
-        CFE_SB_DecrBufUseCnt(BufDscPtr);
     }
 
     /* Before unlocking, increment relevant error counter if needed */