diff --git a/uppsrc/Core/FilterStream.cpp b/uppsrc/Core/FilterStream.cpp
index bb7071125..47d50f330 100644
--- a/uppsrc/Core/FilterStream.cpp
+++ b/uppsrc/Core/FilterStream.cpp
@@ -120,7 +120,7 @@ void OutFilterStream::Close()
 void OutFilterStream::FlushOut()
 {
 	if(ptr != ~buffer) {
-		Filter(~buffer, ptr - ~buffer);
+		Filter(~buffer, (int)(ptr - ~buffer));
 		ptr = ~buffer;
 	}
 }
diff --git a/uppsrc/CtrlCore/Win32Wnd.cpp b/uppsrc/CtrlCore/Win32Wnd.cpp
index 352bcf9c0..6551fde83 100644
--- a/uppsrc/CtrlCore/Win32Wnd.cpp
+++ b/uppsrc/CtrlCore/Win32Wnd.cpp
@@ -243,6 +243,12 @@ void Ctrl::InitWin32(HINSTANCE hInstance)
 {
 	GuiLock __;
 	LLOG("InitWin32");
+
+	BOOL (STDAPICALLTYPE * SetProcessDPIAware)(void);
+	DllFn(SetProcessDPIAware, "User32.dll", "SetProcessDPIAware");
+	if(SetProcessDPIAware)
+		(*SetProcessDPIAware)();
+
 	InstallPanicMessageBox(&Win32PanicMessageBox);
 //	RLOGBLOCK("Ctrl::InitWin32");
 	sMainThreadId = GetCurrentThreadId();
diff --git a/uppsrc/Draw/FontWin32.cpp b/uppsrc/Draw/FontWin32.cpp
index e7fcaef51..7b2849c2d 100644
--- a/uppsrc/Draw/FontWin32.cpp
+++ b/uppsrc/Draw/FontWin32.cpp
@@ -15,6 +15,10 @@ void GetStdFontSys(String& name, int& height)
 	name = "Arial";
 	height = 10;
 #else
+	BOOL (STDAPICALLTYPE * SetProcessDPIAware)(void);
+	DllFn(SetProcessDPIAware, "User32.dll", "SetProcessDPIAware");
+	if(SetProcessDPIAware)
+		(*SetProcessDPIAware)();
 	NONCLIENTMETRICS ncm;
 	ncm.cbSize = sizeof(ncm);
 	::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0);