diff --git a/source/ngc/cheatmgr.cpp b/source/ngc/cheatmgr.cpp
index 1ec3e6a..6bb1b1c 100644
--- a/source/ngc/cheatmgr.cpp
+++ b/source/ngc/cheatmgr.cpp
@@ -26,7 +26,7 @@ extern SCheatData Cheat;
  * Custom version of S9xLoadCheatFile()
  ***************************************************************************/
 
-bool8 NGCLoadCheatFile (int length)
+bool NGCLoadCheatFile (int length)
 {
 	Cheat.num_cheats = 0;
 
@@ -50,7 +50,7 @@ bool8 NGCLoadCheatFile (int length)
 		}
 	}
 
-	return (TRUE);
+	return true;
 }
 
 /****************************************************************************
@@ -73,6 +73,8 @@ SetupCheats()
 	if(method == METHOD_AUTO)
 		method = autoSaveMethod();
 
+	AllocSaveBuffer();
+
 	if(method == METHOD_SD || method == METHOD_USB)
 	{
 		if(ChangeFATInterface(method, NOTSILENT))
@@ -97,4 +99,6 @@ SetupCheats()
 				S9xDisableCheat(i);
 		}
 	}
+
+	FreeSaveBuffer ();
 }