diff --git a/source/ngc/fceugc.c b/source/ngc/fceugc.c
index 61d0254..09efb31 100644
--- a/source/ngc/fceugc.c
+++ b/source/ngc/fceugc.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 	}
 
     InitialiseSound();
-    fatInitDefault();
+    fatInit (8, false);
 #ifndef HW_RVL
     DVD_Init();
 #endif
diff --git a/source/ngc/fileop.c b/source/ngc/fileop.c
index 5e9bb1b..93255bd 100644
--- a/source/ngc/fileop.c
+++ b/source/ngc/fileop.c
@@ -59,6 +59,7 @@ bool ChangeFATInterface(int method, bool silent)
 		{
 			devFound = true;
 			fatSetDefaultInterface(PI_INTERNAL_SD);
+			fatEnableReadAhead (PI_INTERNAL_SD, 6, 64);
 		}
 		#endif
 
@@ -85,6 +86,7 @@ bool ChangeFATInterface(int method, bool silent)
 		{
 			devFound = true;
 			fatSetDefaultInterface(PI_USBSTORAGE);
+			fatEnableReadAhead (PI_USBSTORAGE, 6, 64);
 		}
 		else
 		{
diff --git a/source/ngc/filesel.c b/source/ngc/filesel.c
index 7783194..5365bad 100644
--- a/source/ngc/filesel.c
+++ b/source/ngc/filesel.c
@@ -353,6 +353,10 @@ int FileSelector (int method)
 			}
 			else	// this is a file
 			{
+				// check that this is a valid ROM
+				if(!IsValidROM(method))
+					return 0;
+
 				// store the filename (w/o ext) - used for state saving
 				StripExt(romFilename, filelist[selection].filename);