diff --git a/engine/wscript b/engine/wscript
index 5dd0c5f8..87c439a7 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -50,11 +50,11 @@ def configure(conf):
 		conf.env.append_unique('DEFINES', 'SUPPORT_BSP2_FORMAT')
 
 	if conf.env.DEST_OS == 'win32':
-		conf.check( lib='USER32' )
-		conf.check( lib='SHELL32' )
-		conf.check( lib='GDI32' )
-		conf.check( lib='ADVAPI32' )
-		conf.check( lib='DBGHELP' )
+		conf.check( lib='user32' )
+		conf.check( lib='shell32' )
+		conf.check( lib='gdi32' )
+		conf.check( lib='advapi32' )
+		conf.check( lib='dbghelp' )
 		conf.env.append_unique('DEFINES', 'DBGHELP')
 
 def get_subproject_name(ctx):
@@ -77,7 +77,7 @@ def build(bld):
 		libs += [ 'DL', 'M', 'PTHREAD' ]
 		source += bld.path.ant_glob(['platform/posix/*.c'])
 	else:
-		libs += ['USER32', 'SHELL32', 'GDI32', 'ADVAPI32', 'DBGHELP']
+		libs += ['user32', 'shell32', 'gdi32', 'advapi32', 'dbghelp']
 		source += bld.path.ant_glob(['platform/win32/*.c'])
 
 	if bld.env.DEST_OS == 'linux':
@@ -94,7 +94,7 @@ def build(bld):
 	else:
 		if(bld.env.DEST_OS == 'linux'):
 			libs.append('RT')
-	
+
 	includes = ['common', 'server', 'client', 'client/vgui', '.', '../common', '../pm_shared' ]
 
 	if(bld.env.SINGLE_BINARY):
diff --git a/game_launch/wscript b/game_launch/wscript
index 9c7647a1..1141b33b 100644
--- a/game_launch/wscript
+++ b/game_launch/wscript
@@ -18,8 +18,8 @@ def configure(conf):
 	# check for dedicated server build
 	if not conf.env.DEDICATED:
 		if conf.env.DEST_OS == 'win32':
-			conf.check(lib='USER32')
-			conf.check(lib='SHELL32')
+			conf.check(lib='user32')
+			conf.check(lib='shell32')
 
 def get_subproject_name(ctx):
         return os.path.basename(os.path.realpath(str(ctx.path)))
@@ -40,7 +40,7 @@ def build(bld):
 	else:
 		# compile resource on Windows
 		bld.load('winres')
-		libs += ['USER32', 'SHELL32']
+		libs += ['user32', 'shell32']
 		source += ['game.rc']
 
 	bld(
diff --git a/mainui b/mainui
index bc99e055..177e49ca 160000
--- a/mainui
+++ b/mainui
@@ -1 +1 @@
-Subproject commit bc99e055d5648aeb032f571943641edc8ced53dd
+Subproject commit 177e49ca640a4a695df92106c211e5a47a838c8b
diff --git a/scripts/build_mingw_engine.sh b/scripts/build_mingw_engine.sh
index a1548fef..947e7986 100755
--- a/scripts/build_mingw_engine.sh
+++ b/scripts/build_mingw_engine.sh
@@ -7,6 +7,7 @@ export CC="ccache i686-w64-mingw32-gcc"
 export CXX="ccache i686-w64-mingw32-g++"
 export CFLAGS="-static-libgcc -no-pthread"
 export CXXFLAGS="-static-libgcc -static-libstdc++"
+export WINRC="i686-w64-mingw32-windres"
 ./waf configure -o build-mingw --sdl2=$TRAVIS_BUILD_DIR/SDL2_mingw/i686-w64-mingw32/ --no-vgui --build-type=debug # can't compile VGUI support on MinGW, due to differnet C++ ABI
 ./waf build -o build-mingw -j2
 # cp SDL2/SDL2-2.0.7/i686-w64-mingw32/bin/SDL2.dll . # Install SDL2
diff --git a/scripts/build_osx_engine.sh b/scripts/build_osx_engine.sh
index ef614172..48220770 100755
--- a/scripts/build_osx_engine.sh
+++ b/scripts/build_osx_engine.sh
@@ -3,7 +3,6 @@
 # Build engine
 
 cd $TRAVIS_BUILD_DIR
-mkdir -p osx-build && cd osx-build
 export CFLAGS="-m32"
 export CXXFLAGS="-m32"
 python waf configure --sdl2=~/Library/Frameworks/SDL2.framework/ --vgui=$TRAVIS_BUILD_DIR/vgui-dev --build-type=debug