diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index f9b0a5d9c0..cca835751d 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -393,6 +393,8 @@ void EmuThread()
 	// ENTER THE VIDEO THREAD LOOP
 	if (_CoreParameter.bCPUThread)
 	{
+		g_video_backend->Video_Prepare();
+
 		// This thread, after creating the EmuWindow, spawns a CPU
 		// thread, and then takes over and becomes the video thread
 		cpuThread = std::thread(CpuThread);
@@ -402,7 +404,6 @@ void EmuThread()
 		Host_UpdateDisasmDialog();
 		Host_UpdateMainFrame();
 
-		g_video_backend->Video_Prepare();
 		g_video_backend->Video_EnterLoop();
 	}
 	else // SingleCore mode
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 6a7d149ea5..4a4f83042a 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -91,6 +91,8 @@ private:
 class NetPlayUI
 {
 public:
+	virtual ~NetPlayUI() {};
+
 	virtual void BootGame(const std::string& filename) = 0;
 	virtual void StopGame() = 0;
 
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index d1b497788c..19d37838f9 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -217,4 +217,4 @@ void RunGpu()
 			fifo.CPReadWriteDistance -= 32;											
 		}
 		CommandProcessor::SetCpStatus();
-}
\ No newline at end of file
+}