diff --git a/Source/DiabloUI/text.cpp b/Source/DiabloUI/text.cpp
index f05e894dc..d1ce328d5 100644
--- a/Source/DiabloUI/text.cpp
+++ b/Source/DiabloUI/text.cpp
@@ -18,7 +18,7 @@ void WordWrapArtStr(char *text, std::size_t width, std::size_t size)
 {
 	const std::size_t textLength = strlen(text);
 	std::size_t lineStart = 0;
-	int lineWidth = 0;
+	std::size_t lineWidth = 0;
 	for (std::size_t i = 0; i < textLength; i++) {
 		if (text[i] == '\n') { // Existing line break, scan next line
 			lineStart = i + 1;
diff --git a/Source/engine/render/text_render.cpp b/Source/engine/render/text_render.cpp
index 32e461786..bf400c529 100644
--- a/Source/engine/render/text_render.cpp
+++ b/Source/engine/render/text_render.cpp
@@ -214,7 +214,7 @@ void WordWrapGameString(char *text, size_t width, size_t size)
 {
 	const size_t textLength = strlen(text);
 	size_t lineStart = 0;
-	int lineWidth = 0;
+	size_t lineWidth = 0;
 	for (unsigned i = 0; i < textLength; i++) {
 		if (text[i] == '\n') { // Existing line break, scan next line
 			lineStart = i + 1;
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 9f5d33657..cde6db3cd 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -131,7 +131,7 @@ void LoadPalette(const char *pszFileName)
 
 	LoadFileInMem(pszFileName, PalData);
 
-	for (int i = 0; i < PalData.size(); i++) {
+	for (unsigned i = 0; i < PalData.size(); i++) {
 		orig_palette[i].r = PalData[i].r;
 		orig_palette[i].g = PalData[i].g;
 		orig_palette[i].b = PalData[i].b;