diff --git a/GPU/GPUState.cpp b/GPU/GPUState.cpp
index acd8eeca28..2bf65e27d8 100644
--- a/GPU/GPUState.cpp
+++ b/GPU/GPUState.cpp
@@ -41,8 +41,8 @@ void GPU_Init() {
 	case GPU_SOFTWARE:
 		gpu = new SoftGPU();
 		break;
-	}
 #endif
+	}
 }
 
 void GPU_Shutdown() {
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 0b054fb3cd..8408d4a41c 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -110,7 +110,7 @@ symbian {
 
 contains(MEEGO_EDITION,harmattan) {
 	target.path = /opt/PPSSPP/bin
-	assets.files = ../assets/flash0 ../lang
+	assets.files = ../flash0 ../lang
 	assets.path = /opt/PPSSPP
 	desktopfile.files = PPSSPP.desktop
 	desktopfile.path = /usr/share/applications
diff --git a/native b/native
index a0560859e2..f7c51bbeee 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit a0560859e2160b185d86239ff2b44e872cfc3dd4
+Subproject commit f7c51bbeee023293e6338f6f664fcb85c6dbb89f