diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index a423b7f805..6bfcc91249 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -280,7 +280,7 @@ THREAD_RETURN CpuThread(void *pArg)
 THREAD_RETURN EmuThread(void *pArg)
 {
 	Common::SetCurrentThreadName("Emuthread - starting");
-	const SCoreStartupParameter _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
+	const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
 
 	CPluginManager &Plugins = CPluginManager::GetInstance();
 	if (_CoreParameter.bLockThreads)
@@ -306,7 +306,7 @@ THREAD_RETURN EmuThread(void *pArg)
 	VideoInitialize.pCopiedToXFB		= Callback_VideoCopiedToXFB;
 	VideoInitialize.pVIRegs             = VideoInterface::m_UVIUnknownRegs;
 	VideoInitialize.pPeekMessages       = NULL;
-    VideoInitialize.pUpdateFPSDisplay   = NULL;
+	VideoInitialize.pUpdateFPSDisplay   = NULL;
 	VideoInitialize.pCPFifo             = (SCPFifoStruct*)&CommandProcessor::fifo;
 	VideoInitialize.pUpdateInterrupts   = &(CommandProcessor::UpdateInterruptsFromVideoPlugin);
 	VideoInitialize.pMemoryBase         = Memory::base;
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 37ab815b9b..8d89d580b6 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#define MAXPADS 1
+#define MAXPADS 4
 #define MAXWIIMOTES 1
 
 struct SCoreStartupParameter
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index aa023e05df..3abbca6e3a 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -112,9 +112,9 @@ bool BootCore(const std::string& _rFilename)
 
 	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
 	StartUp.m_strFilename = _rFilename;
+	SConfig::GetInstance().m_LastFilename = _rFilename;
 	StartUp.bRunCompareClient = false;
 	StartUp.bRunCompareServer = false;
-	std::string BaseDataPath;
 
 	#ifdef _WIN32
 		StartUp.hInstance = wxGetInstance();