diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 77b2c18df8..64c09839d2 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -10,7 +10,14 @@ include(Settings.pri)
 # Libs
 symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
 blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
-win32: LIBS += -L$$OUT_PWD/release -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
+win32 {
+	CONFIG(release, debug|release) {
+		LIBS += -L$$OUT_PWD/release
+	} else {
+		LIBS += -L$$OUT_PWD/debug
+    }
+	LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
+}
 linux: LIBS += -L. -lCore -lCommon -lNative
 
 linux:!mobile_platform {
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 953e138ec3..9956e529eb 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -8,7 +8,7 @@ INCLUDEPATH += ../ext/zlib ../native/ext/glew ../Common
 
 win32-msvc* {
 	QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
-	DEFINES += _MBCS GLEW_STATIC NOMINMAX
+	DEFINES += _MBCS GLEW_STATIC NOMINMAX NODRAWTEXT _CRT_SECURE_NO_WARNINGS
 	PRECOMPILED_HEADER = ../Windows/stdafx.h
 	PRECOMPILED_SOURCE = ../Windows/stdafx.cpp
 } else {
diff --git a/Qt/debugger_displaylist.cpp b/Qt/debugger_displaylist.cpp
index 5b688d7337..330dcbb9b8 100644
--- a/Qt/debugger_displaylist.cpp
+++ b/Qt/debugger_displaylist.cpp
@@ -1686,9 +1686,10 @@ void Debugger_DisplayList::UpdateVertexInfo()
 
 	VertexDecoder vtcDec;
 	vtcDec.SetVertexType(state.vertType);
-	u8 tmp[20*vtcDec.GetDecVtxFmt().stride];
+	u8* tmp = u8(20*vtcDec.GetDecVtxFmt().stride);
 	vtcDec.DecodeVerts(tmp,Memory::GetPointer(vaddr),0,0,0,0,19);
 	VertexReader vtxRead(tmp,vtcDec.GetDecVtxFmt(),state.vertType);
+	delete tmp;
 
 	for(int i = 0; i < maxVtxDisplay; i++)
 	{
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index c6b45a5dcc..80f99d9919 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -154,10 +154,10 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
 
 	if (g_Config.currentDirectory == "")
 	{
-		g_Config.currentDirectory = getenv("HOME");
+		g_Config.currentDirectory = QDir::homePath().toStdString();
 	}
 
-	g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/";
+	g_Config.memCardDirectory = QDir::homePath().toStdString()+"/.ppsspp/";
 	g_Config.flashDirectory = g_Config.memCardDirectory+"/flash/";
 
 	LogManager::Init();
diff --git a/native b/native
index f5e7bd5a9c..14386f87b0 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit f5e7bd5a9c3e4b39a4eac71b577f06ad54f2bc96
+Subproject commit 14386f87b044ff59bf509a35591debf89d917fb2