diff --git a/uppsrc/CodeEditor/CInit.cpp b/uppsrc/CodeEditor/CInit.cpp
index c22db1c9b..696e9bf21 100644
--- a/uppsrc/CodeEditor/CInit.cpp
+++ b/uppsrc/CodeEditor/CInit.cpp
@@ -79,6 +79,7 @@ void CSyntax::InitKeywords()
 		"int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64", "qword",
 		"INTERLOCKED_", "INTERLOCKED", "ONCELOCK", "ONCELOCK_", "INITBLOCK", "EXITBLOCK",
 		"rval_", "rval_default", "size_t", "intptr_t", "uintptr_t", "INITIALIZER", "INITIALIZE",
+		"hash_t",
 		NULL
 	};
 	static const char *usc[] = {
diff --git a/uppsrc/Esc/EscValue.cpp b/uppsrc/Esc/EscValue.cpp
index 23afe8604..1daf3d845 100644
--- a/uppsrc/Esc/EscValue.cpp
+++ b/uppsrc/Esc/EscValue.cpp
@@ -112,7 +112,7 @@ int EscValue::GetCount() const
 	return 1;
 }
 
-unsigned EscValue::GetHashValue() const
+hash_t EscValue::GetHashValue() const
 {
 	LTIMING("GetHashValue");
 	if(hash == 0) {