diff --git a/.gitignore b/.gitignore
index 2690d7c4..a982660b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,4 +175,6 @@ Docs/*.exe
 
 PGOHelper/PGOMesenHome
 *.profraw
-*.profdata
\ No newline at end of file
+*.profdata
+
+packages/*
\ No newline at end of file
diff --git a/Core/HistoryViewer.cpp b/Core/HistoryViewer.cpp
index 07fae039..0c839542 100644
--- a/Core/HistoryViewer.cpp
+++ b/Core/HistoryViewer.cpp
@@ -37,10 +37,10 @@ uint32_t HistoryViewer::GetHistoryLength()
 
 void HistoryViewer::GetHistorySegments(uint32_t *segmentBuffer, uint32_t &bufferSize)
 {
-	size_t segmentIndex = 0;
+	uint32_t segmentIndex = 0;
 	for(size_t i = 0; i < _history.size(); i++) {
 		if(_history[i].EndOfSegment) {
-			segmentBuffer[segmentIndex] = i;
+			segmentBuffer[segmentIndex] = (uint32_t)i;
 			segmentIndex++;
 
 			if(segmentIndex == bufferSize) {