diff --git a/project/jni/application/pachi/AndroidAppSettings.cfg b/project/jni/application/pachi/AndroidAppSettings.cfg
index 9f93cfdf6..283d6f08a 100644
--- a/project/jni/application/pachi/AndroidAppSettings.cfg
+++ b/project/jni/application/pachi/AndroidAppSettings.cfg
@@ -11,7 +11,7 @@ SdlVideoResizeKeepAspect=n
 NeedDepthBuffer=n
 AppUsesMouse=n
 AppNeedsArrowKeys=y
-AppUsesJoystick=y
+AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
diff --git a/project/jni/application/pachi/src/init.h b/project/jni/application/pachi/src/init.h
index a91ba308c..febbcee92 100644
--- a/project/jni/application/pachi/src/init.h
+++ b/project/jni/application/pachi/src/init.h
@@ -33,7 +33,7 @@ void initsdl()
     SDL_WM_SetIcon(SDL_LoadBMP(DATADIR"/Tgfx/icon.bmp"),NULL);
 
     fullscreen=0;
-    screen = SDL_SetVideoMode(screen_w,screen_h,screen_bpp, SDL_HWSURFACE|SDL_DOUBLEBUF);
+    screen = SDL_SetVideoMode(screen_w,screen_h,screen_bpp, /*SDL_HWSURFACE|SDL_DOUBLEBUF*/ SDL_SWSURFACE ); // TODO: fix HW surfaces
     if (screen == NULL)
     {
         fprintf(stderr, "Can't set the video mode. Quitting.\nError; %s\n", SDL_GetError());
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
index afd9accea..1ead2a51b 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
@@ -100,7 +100,7 @@ static void ANDROID_UpdateRects(_THIS, int numrects, SDL_Rect *rects);
 
 /* Private display data */
 
-#define SDL_NUMMODES 5
+#define SDL_NUMMODES 6
 static SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
 
 //#define SDL_modelist		(this->hidden->SDL_modelist)
@@ -226,11 +226,12 @@ int ANDROID_VideoInit(_THIS, SDL_PixelFormat *vformat)
 	/* Modes sorted largest to smallest */
 	SDL_modelist[0]->w = SDL_ANDROID_sWindowWidth; 
 	SDL_modelist[0]->h = SDL_ANDROID_sWindowHeight;
-	SDL_modelist[1]->w = 640; SDL_modelist[1]->h = 480; // Will likely be shrinked
-	SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 400; // Will likely be shrinked
-	SDL_modelist[3]->w = 320; SDL_modelist[3]->h = 240; // Always available on any screen and any orientation
-	SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 200; // Always available on any screen and any orientation
-	SDL_modelist[5] = NULL;
+	SDL_modelist[1]->w = 800; SDL_modelist[1]->h = 600; // Will likely be shrinked
+	SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 480; // Will likely be shrinked
+	SDL_modelist[3]->w = 640; SDL_modelist[3]->h = 400; // Will likely be shrinked
+	SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240; // Always available on any screen and any orientation
+	SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200; // Always available on any screen and any orientation
+	SDL_modelist[6] = NULL;
 	
 	SDL_VideoInit_1_3(NULL, 0);