diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 57296f0a5..cdecf6633 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1319,7 +1319,6 @@ void GUI_AKD_Conservative_Write(int);
 void GUI_DragDistance_Write(int);
 void GUI_DblClickTime_Write(int);
 void GUI_WheelScrollLines_Write(int);
-void GUI_HiDPI_Write(int);
 
 void  EditFieldIsThin_Write(int);
 void  TopSeparator1_Write(Value);
diff --git a/uppsrc/CtrlLib/ChWin32.cpp b/uppsrc/CtrlLib/ChWin32.cpp
index 38d2bf202..31c5bee48 100644
--- a/uppsrc/CtrlLib/ChWin32.cpp
+++ b/uppsrc/CtrlLib/ChWin32.cpp
@@ -614,10 +614,6 @@ void ChSysInit()
 	if(height > 0 && height < 200) // sanity..
 		Font::SetDefaultFont(Font(q >= 0 ? q : Font::SANSSERIF, height));
 	
-	bool uhd = GetStdFontCy() > 22;
-	GUI_HiDPI_Write(GetStdFontCy() > 22);
-	SetUHDMode(uhd);
-
 	GUI_GlobalStyle_Write(IsWinXP() && !ScreenInPaletteMode() && IsSysFlag(0x1022 /*SPI_GETFLATMENU*/)
 	                      ? GUISTYLE_XP : GUISTYLE_CLASSIC);
 #ifndef PLATFORM_WINCE
diff --git a/uppsrc/Sql/SqlStatement.cpp b/uppsrc/Sql/SqlStatement.cpp
index 342360abd..1c69893e6 100644
--- a/uppsrc/Sql/SqlStatement.cpp
+++ b/uppsrc/Sql/SqlStatement.cpp
@@ -268,7 +268,7 @@ SqlSet SqlSelect::AsTable(const SqlId& tab) const
 {
 	StringBuffer t;
 	t << SqlCode(MSSQL|PGSQL, "")("(")
-	  << "(" << text << ") as \t" << tab.ToString() << '\t'
+	  << "(" << text << ") " << SqlCase(ORACLE,"")("as") << " \t" << tab.ToString() << '\t'
 	  << SqlCode(MSSQL|PGSQL, "")(")");
 	return SqlSet(String(t), SqlSet::HIGH);
 }
diff --git a/uppsrc/plugin/ndisasm/lib/compiler.h b/uppsrc/plugin/ndisasm/lib/compiler.h
index f108015fb..85ab3d228 100644
--- a/uppsrc/plugin/ndisasm/lib/compiler.h
+++ b/uppsrc/plugin/ndisasm/lib/compiler.h
@@ -92,6 +92,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef _MSC_VER
+#define HAVE__SNPRINTF
+#endif
+
 #ifndef HAVE_SNPRINTF
 # ifdef HAVE__SNPRINTF
 #  define snprintf _snprintf
diff --git a/uppsrc/plugin/ndisasm/lib/snprintf.c b/uppsrc/plugin/ndisasm/lib/snprintf.c
index eb012f09d..0936411d9 100644
--- a/uppsrc/plugin/ndisasm/lib/snprintf.c
+++ b/uppsrc/plugin/ndisasm/lib/snprintf.c
@@ -13,6 +13,7 @@
 #include "nasmlib.h"
 
 #ifndef HAVE_SNPRINTF
+#ifndef HAVE__SNPRINTF
 
 int snprintf(char *str, size_t size, const char *format, ...)
 {
@@ -33,3 +34,4 @@ int snprintf(char *str, size_t size, const char *format, ...)
 }
 
 #endif
+#endif
\ No newline at end of file