diff --git a/src/fileio.cpp b/src/fileio.cpp
index c1dafab910..8201b7c0f6 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -367,12 +367,12 @@ FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir,
 		strcpy(resolved_name, filename);
 		strtolower(resolved_name);
 
-		uint resolved_len = strlen(resolved_name);
+		size_t resolved_len = strlen(resolved_name);
 
 		/* Resolve ONE directory link */
 		for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) {
 			const std::string &src = link->first;
-			uint len = src.length();
+			size_t len = src.length();
 			if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) {
 				/* Apply link */
 				char resolved_name2[MAX_RESOLVED_LENGTH];
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 7086e2d32f..602c066022 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -1056,7 +1056,7 @@ enum QueryStringWidgets {
 
 struct QueryStringWindow : public QueryStringBaseWindow
 {
-	QueryStringWindow(size_t size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
+	QueryStringWindow(uint16 size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
 	{
 		this->parent = parent;
 		SetBit(_no_scroll, SCROLL_EDIT);
diff --git a/src/querystring_gui.h b/src/querystring_gui.h
index 40b0c86853..05a25c42a0 100644
--- a/src/querystring_gui.h
+++ b/src/querystring_gui.h
@@ -39,11 +39,11 @@ struct QueryString {
 };
 
 struct QueryStringBaseWindow : public Window, public QueryString {
-	const size_t edit_str_size;
 	char *edit_str_buf;
 	char *orig_str_buf;
+	const uint16 edit_str_size;
 
-	QueryStringBaseWindow(size_t size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
+	QueryStringBaseWindow(uint16 size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
 	{
 		this->edit_str_buf = CallocT<char>(size);
 	}