diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 4bc78582b2..be16c6b6dd 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -475,11 +475,10 @@ THREAD_RETURN EmuThread(void *pArg)
 	// The hardware is uninitialized
 	g_bHwInit = false;
 
-	Plugins.ShutdownPlugins();
- 
 	HW::Shutdown();
- 
-	LOG(MASTER_LOG, "EmuThread exited");
+	Plugins.ShutdownPlugins();
+
+ 	LOG(MASTER_LOG, "EmuThread exited");
 	// The CPU should return when a game is stopped and cleanup should be done here, 
 	// so we can restart the plugins (or load new ones) for the next game.
 	if (_CoreParameter.hMainWindow == g_pWindowHandle)
diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
index cdac7beaef..469931359a 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
@@ -30,7 +30,6 @@
 #include "JitCache.h"
 #include "Thunk.h"
 
-#include "../../HW/CPUCompare.h"
 #include "../../HW/GPFifo.h"
 #include "../../Core.h"
 #include "JitAsm.h"
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index 064cab8dfb..b3a5ee00e6 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -51,7 +51,7 @@ void Fifo_Init()
 {
     videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE);
 	fifo_exit_event.Init();
-    fifoStateRun = true;
+	fifoStateRun = false;
 	g_XFBUpdateRequested = FALSE;
 }
 
@@ -101,6 +101,7 @@ void Fifo_ExitLoop()
 
 void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 {
+    fifoStateRun = true;
     SCPFifoStruct &_fifo = *video_initialize.pCPFifo;
 	s32 distToSend;