diff --git a/IDE/src/ui/WatchPanel.bf b/IDE/src/ui/WatchPanel.bf
index 497beab4..06da55be 100644
--- a/IDE/src/ui/WatchPanel.bf
+++ b/IDE/src/ui/WatchPanel.bf
@@ -1295,7 +1295,7 @@ namespace IDE.ui
                         addrsCount = mWatchSeriesInfo.mAddrs.Length / entryAddrSize;
 
                     int totalCount = mWatchSeriesInfo.mCount;
-                    if (totalCount == -1)
+                    if ((totalCount == -1) && (mWatchSeriesInfo.mContinuationData != null))
                     {                        
                         //int wantNewCount = Math.Min(idx + 32, mWatchSeriesInfo.mCount) - addrsCount;
                         bool continuationDone = false;
diff --git a/IDEHelper/WinDebugger.cpp b/IDEHelper/WinDebugger.cpp
index c2d98fa6..247f57e9 100644
--- a/IDEHelper/WinDebugger.cpp
+++ b/IDEHelper/WinDebugger.cpp
@@ -8415,7 +8415,7 @@ void WinDebugger::HandleCustomExpandedItems(String& retVal, DbgCompileUnit* dbgC
 				evalStr += ", refid=\"" + referenceId + ".[]\"";
 				if (isReadOnly)
 					evalStr += ", ne";
-				retVal += "\n:repeat" + StrFormat("\t%d\t%d\t%d", 0, (int)sizeValue.GetInt64() / dimSize1, 50000) +
+				retVal += "\n:repeat" + StrFormat("\t%d\t%lld\t%d", 0, sizeValue.GetInt64() / dimSize1, 50000) +
 					"\t[{0}]\t" + evalStr;
 			}
 			else if (lowerDimSizes.size() == 2)
@@ -8431,7 +8431,7 @@ void WinDebugger::HandleCustomExpandedItems(String& retVal, DbgCompileUnit* dbgC
 					evalStr += ", refid=\"" + referenceId + ".[]\"";
 					if (isReadOnly)
 						evalStr += ", ne";
-					retVal += "\n:repeat" + StrFormat("\t%d\t%d\t%d", 0, (int)sizeValue.GetInt64() / dimSize1 / dimSize2, 50000) +
+					retVal += "\n:repeat" + StrFormat("\t%d\t%lld\t%d", 0, sizeValue.GetInt64() / dimSize1 / dimSize2, 50000) +
 						"\t[{0}]\t" + evalStr;
 				}
 			}
@@ -8449,7 +8449,7 @@ void WinDebugger::HandleCustomExpandedItems(String& retVal, DbgCompileUnit* dbgC
 					evalStr += ", refid=\"" + referenceId + ".[]\"";
 					if (isReadOnly)
 						evalStr += ", ne";
-					retVal += "\n:repeat" + StrFormat("\t%d\t%d\t%d", 0, (int)sizeValue.GetInt64() / dimSize1 / dimSize2 / dimSize3, 50000) +
+					retVal += "\n:repeat" + StrFormat("\t%d\t%lld\t%d", 0, sizeValue.GetInt64() / dimSize1 / dimSize2 / dimSize3, 50000) +
 						"\t[{0}]\t" + evalStr;
 				}
 			}
@@ -8459,7 +8459,7 @@ void WinDebugger::HandleCustomExpandedItems(String& retVal, DbgCompileUnit* dbgC
 				evalStr += ", refid=\"" + referenceId + ".[]\"";
 				if (isReadOnly)
 					evalStr += ", ne";
-				retVal += "\n:repeat" + StrFormat("\t%d\t%d\t%d", 0, (int)sizeValue.GetInt64(), 50000) +
+				retVal += "\n:repeat" + StrFormat("\t%d\t%lld\t%d", 0, sizeValue.GetInt64(), 50000) +
 					"\t[{0}]\t" + evalStr;
 			}
 		}
@@ -8476,7 +8476,7 @@ void WinDebugger::HandleCustomExpandedItems(String& retVal, DbgCompileUnit* dbgC
 			evalStr += ", refid=\"" + referenceId + ".[]\"";
 			if (isReadOnly)
 				evalStr += ", ne";
-			retVal += "\n:repeat" + StrFormat("\t%d\t%d\t%d", 0, (int)sizeValue.GetInt64(), 50000) +
+			retVal += "\n:repeat" + StrFormat("\t%d\t%lld\t%d", 0, sizeValue.GetInt64(), 50000) +
 				"\t[{0}]\t" + evalStr;			
 		}
 	}