diff --git a/newdc/linux-dist/main.cpp b/newdc/linux-dist/main.cpp
index 648fd0aef..02aa93cef 100755
--- a/newdc/linux-dist/main.cpp
+++ b/newdc/linux-dist/main.cpp
@@ -625,7 +625,20 @@ int main(int argc, wchar* argv[])
 	
 	init_sound();
 #endif
+
+#if defined(USES_HOMEDIR)
+	string home = (string)getenv("HOME");
+	if(home.c_str())
+	{
+		home += "/.reicast";
+		mkdir(home.c_str(), 0755); // create the directory if missing
+		SetHomeDir(home);
+	}
+	else
+		SetHomeDir(".");
+#else
 	SetHomeDir(".");
+#endif
 
 	printf("Home dir is: %s\n",GetPath("/").c_str());
 
diff --git a/reicast/android/src/com/reicast/emulator/GL2JNIView.java b/reicast/android/src/com/reicast/emulator/GL2JNIView.java
index eb957c560..3c3c67bc5 100644
--- a/reicast/android/src/com/reicast/emulator/GL2JNIView.java
+++ b/reicast/android/src/com/reicast/emulator/GL2JNIView.java
@@ -52,7 +52,7 @@ import com.example.newdc.JNIdc;
 class GL2JNIView extends GLSurfaceView
 {
   private static String fileName;
-  //private AudioThread audioThread;
+  //private AudioThread audioThread;  
   private EmuThread ethd = new EmuThread();
 
   private static final boolean DEBUG           = false;
@@ -121,7 +121,7 @@ class GL2JNIView extends GLSurfaceView
   public GL2JNIView(Context context,String newFileName,boolean translucent,int depth,int stencil)
   {
     super(context);
-
+    setKeepScreenOn(true);
     vib=(Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
     
     // This is the game we are going to run
diff --git a/reicast/android/src/com/reicast/emulator/MainActivity.java b/reicast/android/src/com/reicast/emulator/MainActivity.java
index fe4ab13b1..cdfa0ba8d 100644
--- a/reicast/android/src/com/reicast/emulator/MainActivity.java
+++ b/reicast/android/src/com/reicast/emulator/MainActivity.java
@@ -226,7 +226,7 @@ public class MainActivity extends Activity {
         for (int i=0;i<list.size();i++)
         {
         	if (list.get(i)!=null && list.get(i).isFile())
-        		if (!list.get(i).getName().endsWith(".gdi") && !list.get(i).getName().endsWith(".cdi") && !list.get(i).getName().endsWith(".chd"))
+        		if (!list.get(i).getName().toLowerCase().endsWith(".gdi") && !list.get(i).getName().toLowerCase().endsWith(".cdi") && !list.get(i).getName().toLowerCase().endsWith(".chd"))
         			continue;
         	
         	View childview=getLayoutInflater().inflate(R.layout.app_list_item, null, false);
@@ -241,9 +241,9 @@ public class MainActivity extends Activity {
          	((ImageView)childview.findViewById(R.id.item_icon)).setImageResource(
          			list.get(i)==null ? R.drawable.config :
          			list.get(i).isDirectory() ? R.drawable.open_folder : 
-         			list.get(i).getName().endsWith(".gdi") ? R.drawable.gdi : 
-         			list.get(i).getName().endsWith(".cdi") ? R.drawable.cdi :
-         			list.get(i).getName().endsWith(".chd") ? R.drawable.chd : 
+         			list.get(i).getName().toLowerCase().endsWith(".gdi") ? R.drawable.gdi : 
+         			list.get(i).getName().toLowerCase().endsWith(".cdi") ? R.drawable.cdi :
+         			list.get(i).getName().toLowerCase().endsWith(".chd") ? R.drawable.chd : 
          			R.drawable.disk_unknown);
         	
          	childview.setTag(list.get(i));
diff --git a/reicast/gcwz/Makefile b/reicast/gcwz/Makefile
index 0dbfc5501..b11ffbfc2 100644
--- a/reicast/gcwz/Makefile
+++ b/reicast/gcwz/Makefile
@@ -30,7 +30,7 @@ SOURCES	:=	cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \
  hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/ 
 
 
-CXXFLAGS := -g -O3  -D RELEASE -c -D TARGET_GCW0 -D HOST_NO_REC #-D NO_REND
+CXXFLAGS := -g -O3  -D RELEASE -c -D TARGET_GCW0 -D USES_HOMEDIR -D HOST_NO_REC #-D NO_REND
 CXXFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant 
 CXXFLAGS += -ffast-math -ftree-vectorize 
 #-fprefetch-loop-arrays