diff --git a/pcsx2/CDVD/IsoFS/IsoFS.h b/pcsx2/CDVD/IsoFS/IsoFS.h
index 7b56e6f9aa..4be6298c3c 100644
--- a/pcsx2/CDVD/IsoFS/IsoFS.h
+++ b/pcsx2/CDVD/IsoFS/IsoFS.h
@@ -7,5 +7,5 @@ struct ISoFileDescriptor;
 #include "SectorSource.h"
 #include "IsoFileDescriptor.h"
 #include "IsoDirectory.h"
-#include "ISoFile.h"
+#include "IsoFile.h"
 
diff --git a/pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp b/pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp
index f33512e5b3..c20abdeda2 100644
--- a/pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp
+++ b/pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp
@@ -19,6 +19,6 @@ int IsoFSCDVD::getNumSectors()
 	return td.lsn;
 }
 
-IsoFSCDVD::~IsoFSCDVD(void)
+IsoFSCDVD::~IsoFSCDVD(void) throw()
 {
 }
diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp
index d14afe3db5..f97ebb9370 100644
--- a/pcsx2/Elfheader.cpp
+++ b/pcsx2/Elfheader.cpp
@@ -587,8 +587,10 @@ void loadElfFile(const wxString& filename)
 	{
 		if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 )
 		{
+		    char* temp;
 			strcpy( (char*)PSM( i ), fnptr );
-			DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", fnptr );
+			strcpy(temp, fnptr); // Passing wxCharBuffers to WriteLn crashes pcsx2.
+			DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", temp  );
 		}
 	}