diff --git a/src/gba/gui/gui-runner.c b/src/gba/gui/gui-runner.c
index 241f865c1..b5256287c 100644
--- a/src/gba/gui/gui-runner.c
+++ b/src/gba/gui/gui-runner.c
@@ -14,12 +14,18 @@
 #include "util/png-io.h"
 #include "util/vfs.h"
 
+#include <sys/time.h>
+
+#define FPS_GRANULARITY 120
+#define FPS_BUFFER_SIZE 3
+
 enum {
 	RUNNER_CONTINUE = 1,
-	RUNNER_EXIT = 2,
-	RUNNER_SAVE_STATE = 3,
-	RUNNER_LOAD_STATE = 4,
-	RUNNER_SCREENSHOT = 5,
+	RUNNER_EXIT,
+	RUNNER_SAVE_STATE,
+	RUNNER_LOAD_STATE,
+	RUNNER_SCREENSHOT,
+	RUNNER_CONFIG,
 	RUNNER_COMMAND_MASK = 0xFFFF,
 
 	RUNNER_STATE_1 = 0x10000,
diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index 56a4b2b17..bdeb30261 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -26,7 +26,7 @@ static enum ScreenMode {
 	SM_AF_TOP,
 	SM_SF_TOP,
 	SM_MAX
-} screenMode = SM_PA_BOTTOM;
+} screenMode = SM_PA_TOP;
 
 #define AUDIO_SAMPLES 0x80
 #define AUDIO_SAMPLE_BUFFER (AUDIO_SAMPLES * 24)
diff --git a/src/platform/psp2/psp2-context.c b/src/platform/psp2/psp2-context.c
index 910878b6c..548087c9a 100644
--- a/src/platform/psp2/psp2-context.c
+++ b/src/platform/psp2/psp2-context.c
@@ -229,6 +229,7 @@ void GBAPSP2Draw(struct GBAGUIRunner* runner, bool faded) {
 	UNUSED(runner);
 	switch (screenMode) {
 	case SM_BACKDROP:
+	default:
 		vita2d_draw_texture_tint(backdrop, 0, 0, (faded ? 0 : 0xC0000000) | 0x3FFFFFFF);
 		// Fall through
 	case SM_PLAIN:
@@ -249,6 +250,7 @@ void GBAPSP2DrawScreenshot(struct GBAGUIRunner* runner, const uint32_t* pixels,
 	}
 	switch (screenMode) {
 	case SM_BACKDROP:
+	default:
 		vita2d_draw_texture_tint(backdrop, 0, 0, (faded ? 0 : 0xC0000000) | 0x3FFFFFFF);
 		// Fall through
 	case SM_PLAIN: