diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index 4231ac6dd8..9b14f0934f 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -78,7 +78,7 @@ FILE *_cdvdOpenMechaVer()
 
 	wxFileName mecfile(EmuConfig.BiosFilename);
 	mecfile.SetExt( L"mec" );
-	wxCharBuffer file( mecfile.GetFullPath().ToUTF8() );
+	const wxCharBuffer file( mecfile.GetFullPath().ToUTF8() );
 
 	// if file doesnt exist, create empty one
 	fd = fopen(file.data(), "r+b");
@@ -118,7 +118,7 @@ FILE *_cdvdOpenNVM()
 
 	wxFileName nvmfile(EmuConfig.BiosFilename);
 	nvmfile.SetExt( L"nvm" );
-	wxCharBuffer file( nvmfile.GetFullPath().ToUTF8() );
+	const wxCharBuffer file( nvmfile.GetFullPath().ToUTF8() );
 
 	// if file doesnt exist, create empty one
 	fd = fopen(file.data(), "r+b");
diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp
index b244a31978..05f3b40fc7 100644
--- a/pcsx2/PluginManager.cpp
+++ b/pcsx2/PluginManager.cpp
@@ -365,16 +365,9 @@ static s32 CALLBACK CDVD_getDualInfo(s32* dualType, u32* layer1Start)
 	return 1;
 }
 
-static void CALLBACK CDVDplugin_Close()
-{
-	g_plugins->Close( PluginId_CDVD );
-}
-
 CDVD_API CDVDapi_Plugin =
 {
-	CDVDplugin_Close,
-
-	// The rest are filled in by the plugin manager
+	// All of these are filled by the plugin manager
 	NULL
 };
 
@@ -383,6 +376,7 @@ CDVD_API* CDVD			= NULL;
 static const LegacyApi_ReqMethod s_MethMessReq_CDVD[] =
 {
 	{	"CDVDopen",			(vMeth**)&CDVDapi_Plugin.open,			NULL },
+	{	"CDVDclose",		(vMeth**)&CDVDapi_Plugin.close,			NULL },
 	{	"CDVDreadTrack",	(vMeth**)&CDVDapi_Plugin.readTrack,		NULL },
 	{	"CDVDgetBuffer",	(vMeth**)&CDVDapi_Plugin.getBuffer,		NULL },
 	{	"CDVDreadSubQ",		(vMeth**)&CDVDapi_Plugin.readSubQ,		NULL },
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index 91028c14e8..75f0c884fb 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -106,9 +106,11 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
 	}
 
 	SysEndExecution();
-	InitPlugins();
 
-	EmuConfig.SkipBiosSplash = GetMenuBar()->IsChecked( MenuId_SkipBiosToggle );
+	g_Conf->EmuOptions.SkipBiosSplash = GetMenuBar()->IsChecked( MenuId_SkipBiosToggle );
+	wxGetApp().SaveSettings();
+
+	InitPlugins();
 
 	CDVDsys_SetFile( CDVDsrc_Iso, g_Conf->CurrentIso );
 	SysExecute( new AppEmuThread(), g_Conf->CdvdSource );