diff --git a/uppsrc/CtrlCore/src.tpp/MacOSMenu_en-us.tpp b/uppsrc/CtrlCore/src.tpp/MacOSMenu_en-us.tpp
index ef1e063ef..02a9ae92b 100644
--- a/uppsrc/CtrlCore/src.tpp/MacOSMenu_en-us.tpp
+++ b/uppsrc/CtrlCore/src.tpp/MacOSMenu_en-us.tpp
@@ -12,7 +12,7 @@ topic "";
 [{_}%EN-US 
 [ {{10000@(113.42.0) [s0; [*@7;4 MacOS menu support]]}}&]
 [s0; &]
-[s0; U`+`+ applications wihout changes to support MacOS application 
+[s0; U`+`+ applications without changes to support MacOS application 
 menu will run with menu inside the window.&]
 [s0; &]
 [s0; To properly support MacOS menu, application needs to provide 
diff --git a/uppsrc/MySql/MySql.upp b/uppsrc/MySql/MySql.upp
index 35e0cd773..bfd8b62a8 100644
--- a/uppsrc/MySql/MySql.upp
+++ b/uppsrc/MySql/MySql.upp
@@ -8,9 +8,7 @@ uses
 	Sql,
 	plugin\z;
 
-library(WIN32 !NOMYSQL MSC) libmysql;
-
-library(WIN32 GCC !NOMYSQL) libmysql.dll;
+library(WIN32) libmysql.lib;
 
 library(LINUX !MT) "mysqlclient ssl";
 
@@ -20,8 +18,6 @@ library(FREEBSD) mysqlclient;
 
 library(OSX) mysqlclient;
 
-link(WIN32 GCC !NOMYSQL) "-Wl,--enable-stdcall-fixup";
-
 link(DEBUG SO) /nodefaultlib:LIBCD;
 
 link(SHARED SO) /nodefaultlib:LIBCMT;
diff --git a/uppsrc/PostgreSQL/PostgreSQL.upp b/uppsrc/PostgreSQL/PostgreSQL.upp
index 5156f101c..2a5559a02 100644
--- a/uppsrc/PostgreSQL/PostgreSQL.upp
+++ b/uppsrc/PostgreSQL/PostgreSQL.upp
@@ -4,11 +4,9 @@ acceptflags
 uses
 	Sql;
 
-library(WIN32 !NOPOSTGRESQL MSC) libpq;
+library(WIN32) libpq.lib;
 
-library(WIN32 !NOPOSTGRESQL GCC) libpq.dll;
-
-library(POSIX !NOPOSTGRESQL) pq;
+library(POSIX) pq;
 
 file
 	PostgreSQL.h,
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 53251b727..c1e0ef620 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -367,7 +367,7 @@ void InstantSetup()
 			libs.At(0) = mingw + "/lib";
 			libs.At(1) = binx + "/opt/lib";
 			libs.At(2) = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
-			libs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
+			libs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/lib" : "bin/pgsql/x86/lib");
 			libs.At(4) = GetExeDirFile(x64 ? "bin/mysql/lib64" : "bin/mysql/lib32");
 	
 			bm.GetAdd("PATH") = Join(bins, ";");