2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 35dc02f..8d27ad2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 DEBUG     = 0
 PERF_TEST = 0
 HAVE_GRIFFIN = 0
-LOAD_FROM_MEMORY_TEST = 0
+LOAD_FROM_MEMORY_TEST = 1
 USE_BLARGG_APU = 1
 
 ifeq ($(platform),)
@@ -107,6 +107,7 @@ else ifeq ($(platform), psp1)
 	CXX = psp-g++$(EXE_EXT)
 	AR = psp-ar$(EXE_EXT)
    STATIC_LINKING = 1
+	LOAD_FROM_MEMORY_TEST = 0
 	FLAGS += -G0 
    CFLAGS += -march=allegrex -mno-abicalls -fno-pic -fno-builtin \
 		-fno-exceptions -ffunction-sections -mno-long-calls \
diff --git a/libretro.c b/libretro.c
index 1f1a3aa..9f3cb0d 100644
--- a/libretro.c
+++ b/libretro.c
@@ -275,9 +275,8 @@ void init_sfc_setting(void)
    Settings.ThreadSound = false;
 #ifdef USE_BLARGG_APU
    Settings.SoundSync = false;
-#else
-   Settings.ApplyCheats = true;
 #endif
+   Settings.ApplyCheats = true;
    Settings.StretchScreenshots = 1;
 
    Settings.HBlankStart = (256 * Settings.H_Max) / SNES_HCOUNTER_MAX;