diff --git a/uppsrc/CodeEditor/CInit.cpp b/uppsrc/CodeEditor/CInit.cpp
index 84a2460d3..50c998b0f 100644
--- a/uppsrc/CodeEditor/CInit.cpp
+++ b/uppsrc/CodeEditor/CInit.cpp
@@ -89,6 +89,7 @@ void CSyntax::InitKeywords()
 		"dim3", "", "__host__", "__device__", "__global__", "__noinline__", "__forceinline__",
 		"__inline_hint__", "__constant__", "__shared__", "__grid_constant__", "__managed__",
 		"__restrict__ ", "gridDim", "blockIdx", "blockDim", "threadIdx", "warpSize",
+		"size_t", "intptr_t", "uintptr_t",
 		NULL
 	};
 	static const char *usc[] = {
diff --git a/uppsrc/Core/Ops.h b/uppsrc/Core/Ops.h
index a4017f40f..7c3e69dbc 100644
--- a/uppsrc/Core/Ops.h
+++ b/uppsrc/Core/Ops.h
@@ -227,7 +227,7 @@ int CountBits64(uint64 mask)
     return __builtin_popcountll(mask);
 #elif defined(_MSC_VER)
     #if defined(_WIN64)
-        return __popcnt64(mask);
+        return (int)__popcnt64(mask);
     #else
         return CountBits(static_cast<dword>(mask)) +  CountBits(static_cast<dword>(mask >> 32));
     #endif