diff --git a/Source/Android/.project b/Source/Android/.project
index a79d8a1840..b4a12698bf 100644
--- a/Source/Android/.project
+++ b/Source/Android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ppsspp</name>
+	<name>dolphinemulator</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 95c319b6aa..db647723ad 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -9,6 +9,7 @@ import java.io.OutputStream;
 import net.simonvt.menudrawer.MenuDrawer;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
@@ -135,7 +136,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 		if (resultCode == Activity.RESULT_OK)
 		{
 			DisplayMetrics displayMetrics = new DisplayMetrics();
-			WindowManager wm = (WindowManager) getApplicationContext().getSystemService(getApplicationContext().WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut
+			WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut
 			wm.getDefaultDisplay().getMetrics(displayMetrics);
 			screenWidth = displayMetrics.widthPixels;
 			screenHeight = displayMetrics.heightPixels;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 9ee11a9f85..60b3f38079 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -68,6 +68,10 @@
 #include <wx/image.h>
 #endif
 
+// glew1.8 doesn't define KHR_debug
+#ifndef GL_DEBUG_OUTPUT
+#define GL_DEBUG_OUTPUT 0x92E0
+#endif
 
 
 void VideoConfig::UpdateProjectionHack()