diff --git a/uppsrc/CodeEditor/PythonSyntax.cpp b/uppsrc/CodeEditor/PythonSyntax.cpp
index 5c998b8e7..053866820 100644
--- a/uppsrc/CodeEditor/PythonSyntax.cpp
+++ b/uppsrc/CodeEditor/PythonSyntax.cpp
@@ -9,7 +9,7 @@ void PythonSyntax::Highlight(const wchar *s, const wchar *end, HighlightOutput&
 		int c = *s;
 		dword pair = MAKELONG(s[0], s[1]);
 		if(c == '#') {
-			hls.Put(end - s, hl_style[INK_COMMENT]);
+			hls.Put(int(end - s), hl_style[INK_COMMENT]);
 			return;
 		}
 		else
diff --git a/uppsrc/Esc/Esc.h b/uppsrc/Esc/Esc.h
index 292b7ac8c..52145f96b 100644
--- a/uppsrc/Esc/Esc.h
+++ b/uppsrc/Esc/Esc.h
@@ -22,7 +22,7 @@ class EscValue : Moveable<EscValue> {
 	};
 
 	int              type;
-	mutable unsigned hash;
+	mutable hash_t   hash;
 
 	struct EscMap;
 	struct EscArray;
diff --git a/uppsrc/TextDiffCtrl/TextDiff.cpp b/uppsrc/TextDiffCtrl/TextDiff.cpp
index 54daf6547..695362e56 100644
--- a/uppsrc/TextDiffCtrl/TextDiff.cpp
+++ b/uppsrc/TextDiffCtrl/TextDiff.cpp
@@ -79,7 +79,7 @@ static void CalcHash(Vector<Index<dword>>& hash, const Vector<String>& file, int
 	{ // 1st row
 		Index<dword>& first = hash.Add();
 		for(int i = 0; i < file.GetCount(); i++)
-			first.Add(GetHashValue(file[i]));
+			first.Add(FoldHash(GetHashValue(file[i])));
 	}
 	static const int prime[] =
 	{