diff --git a/rpcs3/Emu/FS/vfsLocalDir.cpp b/rpcs3/Emu/FS/vfsLocalDir.cpp
index 8a07be19ef..d6eb9e0e66 100644
--- a/rpcs3/Emu/FS/vfsLocalDir.cpp
+++ b/rpcs3/Emu/FS/vfsLocalDir.cpp
@@ -21,7 +21,7 @@ bool vfsLocalDir::Open(const std::string& path)
 	std::string name;
 	for(bool is_ok = dir.GetFirst(&name); is_ok; is_ok = dir.GetNext(&name))
 	{
-		std::string dir_path = path + name;
+		std::string dir_path = path + "/" + name;
 
 		m_entries.emplace_back();
 		// TODO: Use same info structure as fileinfo?
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 27a31f9343..83a9183151 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -2270,7 +2270,7 @@ void RSXThread::Task()
 		if(cmd == 0)
 		{
 			LOG_ERROR(Log::RSX, "null cmd: cmd=0x%x, put=0x%x, get=0x%x (addr=0x%x)", cmd, put, get, (u32)Memory.RSXIOMem.RealAddr(get));
-			Emu.Pause();
+			//Emu.Pause();
 			//HACK! We shouldn't be here
 			m_ctrl->get = get + (count + 1) * 4;
 			continue;
diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp
index b59ccae3ce..6d18ba349b 100644
--- a/rpcs3/Gui/GameViewer.cpp
+++ b/rpcs3/Gui/GameViewer.cpp
@@ -112,7 +112,7 @@ void GameViewer::LoadGames()
 
 	m_games.clear();
 
-	for(const DirEntryInfo* info = dir.Read(); info; info = dir.Read())
+	for(const DirEntryInfo* info : dir)
 	{
 		if(info->flags & DirEntry_TypeDir)
 		{
@@ -182,7 +182,7 @@ void GameViewer::ShowData()
 
 void GameViewer::Refresh()
 {
-	Emu.GetVFS().Init(m_path);
+	Emu.GetVFS().Init("/");
 	LoadGames();
 	LoadPSF();
 	ShowData();
@@ -210,7 +210,7 @@ void GameViewer::DClick(wxListEvent& event)
 
 	Debug::AutoPause::getInstance().Reload();
 
-	Emu.GetVFS().Init(path);
+	Emu.GetVFS().Init("/");
 	std::string local_path;
 	if (Emu.GetVFS().GetDevice(path, local_path) && !Emu.BootGame(local_path)) {
 		LOG_ERROR(HLE, "Boot error: elf not found! [%s]", path.c_str());
diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp
index 3f4f2ab104..2ec10d0ce1 100644
--- a/rpcs3/rpcs3.cpp
+++ b/rpcs3/rpcs3.cpp
@@ -136,11 +136,11 @@ bool Rpcs3App::OnInit()
 	main_thread = std::this_thread::get_id();
 
 	Ini.Load();
-	m_MainFrame = new MainFrame();
-	SetTopWindow(m_MainFrame);
 	Emu.Init();
 	Emu.SetEmulatorPath(executablePath.ToStdString());
 
+	m_MainFrame = new MainFrame();
+	SetTopWindow(m_MainFrame);
 	m_MainFrame->Show();
 	m_MainFrame->DoSettings(true);