diff --git a/packages/ccsds/CcsdsParserZFrameModule.cpp b/packages/ccsds/CcsdsParserZFrameModule.cpp
index 38d7489a8..0b9278f5e 100644
--- a/packages/ccsds/CcsdsParserZFrameModule.cpp
+++ b/packages/ccsds/CcsdsParserZFrameModule.cpp
@@ -101,7 +101,7 @@ int CcsdsParserZFrameModule::parseBuffer (unsigned char* buffer, int bytes, Ccsd
                 #define FRAME_SYNC_SIZE 12 // size of above string
 
                 /* Compare Sync Mark */
-                if(!StringLib::match(frame_sync, frameBuffer, FRAME_SYNC_SIZE))
+                if(!StringLib::match(frame_sync, frameBuffer))
                 {
                     return PARSE_ERROR;
                 }
diff --git a/packages/legacy/CommandProcessor.cpp b/packages/legacy/CommandProcessor.cpp
index 8cee46e0f..f63ecd233 100644
--- a/packages/legacy/CommandProcessor.cpp
+++ b/packages/legacy/CommandProcessor.cpp
@@ -557,7 +557,7 @@ bool CommandProcessor::processCommand (const char* cmdstr)
         /* Get Object and Command */
         #define OBJ_CMD_TOKS 2
         char objtoks[OBJ_CMD_TOKS][MAX_CMD_SIZE];
-        int numobjtoks = StringLib::tokenizeLine(cp_cmd_str, (int)StringLib::size(cp_cmd_str, MAX_CMD_SIZE), OBJ_DELIMETER[0], OBJ_CMD_TOKS, objtoks);
+        int numobjtoks = StringLib::tokenizeLine(cp_cmd_str, (int)StringLib::size(cp_cmd_str), OBJ_DELIMETER[0], OBJ_CMD_TOKS, objtoks);
         if(numobjtoks > 1) // <object name>::<command name>
         {
             try