diff --git a/internal/support/vwatch/vwatch.bm b/internal/support/vwatch/vwatch.bm
index aac0b4075..c32852543 100644
--- a/internal/support/vwatch/vwatch.bm
+++ b/internal/support/vwatch/vwatch.bm
@@ -314,7 +314,6 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
                     ELSEIF vw_varType$ = "STRING" THEN
                         vw_varSize = LEN(vw_dummy%&)
                     END IF
-
                     'this is where we calculate the actual element position in memory
                     IF vw_arrayelementsize = 0 THEN
                         vw_address = vw_address + ((vw_arrayIndex - vw_lbound) * vw_varSize)
@@ -332,7 +331,7 @@ SUB vwatch (globalVariables AS _OFFSET, localVariables AS _OFFSET)
 
                 IF INSTR(vw_varType$, "STRING *") > 0 AND (vw_isarray <> 0 OR vw_elementoffset > 0) THEN
                     'actual data already fetched; nothing else to do
-                ELSEIF INSTR(vw_varType$, "STRING") THEN
+                ELSEIF vw_varType$ = "STRING" THEN
                     IF vw_isarray <> 0 OR vw_elementoffset > 0 THEN
                         'First pass
                         vw_varSize = LEN(vw_dummy%&)
diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index fcfcf140a..f4187899d 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -7412,7 +7412,7 @@ SUB DebugMode
                             cmd$ = cmd$ + MKL$(tempStorage&)
                             cmd$ = cmd$ + MKI$(LEN(usedVariableList(tempIndex&).subfunc))
                             cmd$ = cmd$ + usedVariableList(tempIndex&).subfunc
-                            cmd$ = cmd$ + MKI$(LEN(tempVarType$)) + tempVarType$
+                            cmd$ = cmd$ + MKI$(LEN(varType$)) + varType$
                             GOSUB SendCommand
                         ELSE
                             cmd$ = ""