diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
index d0d4f33b3a..13ab8fe007 100644
--- a/Source/Core/Core/Src/Boot/Boot.cpp
+++ b/Source/Core/Core/Src/Boot/Boot.cpp
@@ -45,7 +45,7 @@
 #include "../PowerPC/SymbolDB.h"
 #include "../MemTools.h"
 
-#include "ConfigManager.h"
+#include "../ConfigManager.h"
 #include "VolumeCreator.h" // DiscIO
 
 void CBoot::Load_FST(bool _bIsWii)
diff --git a/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp b/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp
index 01295993cf..a442ece969 100644
--- a/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_BIOSEmu.cpp
@@ -29,7 +29,7 @@
 #include "../PatchEngine.h"
 #include "../MemTools.h"
 
-#include "ConfigManager.h"
+#include "../ConfigManager.h"
 #include "VolumeCreator.h"
 #include "Boot.h"
 
diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp
index 8e0b9cb5c1..791bc5303a 100644
--- a/Source/Core/Core/Src/PluginManager.cpp
+++ b/Source/Core/Core/Src/PluginManager.cpp
@@ -109,9 +109,11 @@ bool CPluginManager::InitPlugins() {
 }
 
 void CPluginManager::ShutdownPlugins() {
-   for (int i=0;i<1;i++) {
+   for (int i=0;i<MAXPADS;i++) {
        if (m_pad[i])
 	   m_pad[i]->Shutdown();
+   }
+   for (int i=0;i<MAXWIIMOTES;i++) {
        if (m_wiimote[i])
 	   m_wiimote[i]->Shutdown();
    }