3 files changed, 10 insertions, 7 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 6e04ca284b..7d03156bb6 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -577,6 +577,8 @@ int AGOSEngine::init() {
 
 
 		_midiEnabled = true;
+	} else {
+		_driver = NULL;
 	}
 
 	// allocate buffers
@@ -880,7 +882,8 @@ AGOSEngine::~AGOSEngine() {
 		delete _gameFile;
 
 	_midi.close();
-	delete _driver;
+	if (_driver)
+		delete _driver;
 
 	AudioCD.destroy();
 
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index 76a0b8e76f..2cf285d56a 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -393,11 +393,11 @@ static const byte bmp_hdr[] = {
 };
 
 void dumpBMP(const char *filename, int w, int h, const byte *bytes, const uint32 *palette) {
-	Common::File out;
+	Common::DumpFile out;
 	byte my_hdr[sizeof(bmp_hdr)];
 	int i;
 
-	out.open(filename, Common::File::kFileWriteMode);
+	out.open(filename);
 	if (!out.isOpen())
 		return;
 
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 34e5f2cfeb..4a5c43e706 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -75,7 +75,7 @@ int AGOSEngine::countSaveGames() {
 }
 
 char *AGOSEngine::genSaveName(int slot) {
-	static char buf[15];
+	static char buf[20];
 
 	if (getGameId() == GID_DIMP) {
 		sprintf(buf, "dimp.sav");
@@ -111,7 +111,7 @@ void AGOSEngine::quickLoadOrSave() {
 	}
 
 	bool success;
-	char buf[50];
+	char buf[60];
 
 	char *filename = genSaveName(_saveLoadSlot);
 	if (_saveLoadType == 2) {
@@ -978,7 +978,7 @@ bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
 	if (restartMode) {
 		// Load restart state
 		Common::File *file = new Common::File();
-		file->open(filename, Common::File::kFileReadMode);
+		file->open(filename);
 		f = file;
 	} else {
 		f = _saveFileMan->openForLoading(filename);
@@ -1154,7 +1154,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
 	if (restartMode) {
 		// Load restart state
 		Common::File *file = new Common::File();
-		file->open(filename, Common::File::kFileReadMode);
+		file->open(filename);
 		f = file;
 	} else {
 		f = _saveFileMan->openForLoading(filename);