diff --git a/rpcs3/Emu/Io/usio.cpp b/rpcs3/Emu/Io/usio.cpp
index c973660feb..0bd9d9fd81 100644
--- a/rpcs3/Emu/Io/usio.cpp
+++ b/rpcs3/Emu/Io/usio.cpp
@@ -122,12 +122,12 @@ void usb_device_usio::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue
 	transfer->fake = true;
 
 	// Control transfers are nearly instant
-	switch (bmRequestType)
+	//switch (bmRequestType)
 	{
-	default:
+	//default:
 		// Follow to default emulated handler
 		usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
-		break;
+		//break;
 	}
 }
 
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 192ba4ca11..5674623bcc 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -424,7 +424,17 @@ void Emulator::Init()
 		make_path_verbose(dev_flash, true);
 		make_path_verbose(dev_flash2, true);
 		make_path_verbose(dev_flash3, true);
-		make_path_verbose(dev_usb, true);
+		
+		if (make_path_verbose(dev_usb, true))
+		{
+			make_path_verbose(dev_usb + "MUSIC/", false);
+			make_path_verbose(dev_usb + "VIDEO/", false);
+			make_path_verbose(dev_usb + "PICTURE/", false);
+			make_path_verbose(dev_usb + "PS3/EXPORT/PSV/", false); // PS1 and PS2 Saves go here
+			make_path_verbose(dev_usb + "PS3/SAVEDATA", false);
+			make_path_verbose(dev_usb + "PS3/THEME", false);
+			make_path_verbose(dev_usb + "PS3/UPDATE", false);
+		}
 
 		if (make_path_verbose(dev_hdd1, true))
 		{
@@ -453,6 +463,16 @@ void Emulator::Init()
 			make_path_verbose(dev_hdd0 + "savedata/", false);
 			make_path_verbose(dev_hdd0 + "savedata/vmc/", false);
 			make_path_verbose(dev_hdd0 + "photo/", false);
+			make_path_verbose(dev_hdd0 + "music/", false);
+			make_path_verbose(dev_hdd0 + "theme/", false);
+			make_path_verbose(dev_hdd0 + "video/", false);
+			make_path_verbose(dev_hdd0 + "drm/", false);
+			make_path_verbose(dev_hdd0 + "vsh/", false);
+			make_path_verbose(dev_hdd0 + "crash_report/", false);
+			make_path_verbose(dev_hdd0 + "tmp/", false);
+			make_path_verbose(dev_hdd0 + "mms/", false); //multimedia server for vsh, created from rebuilding the database
+			make_path_verbose(dev_hdd0 + "data/", false);
+			make_path_verbose(dev_hdd0 + "vm/", false);
 		}
 
 		const std::string games_common_dir = g_cfg_vfs.get(g_cfg_vfs.games_dir, emu_dir);
diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h
index e940fa03e1..17ec7ea30e 100644
--- a/rpcs3/rpcs3qt/main_window.h
+++ b/rpcs3/rpcs3qt/main_window.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #ifdef _WIN32
-#include <QWinTHumbnailToolbar>
-#include <QWinTHumbnailToolbutton>
+#include <QWinThumbnailToolBar>
+#include <QWinThumbnailToolButton>
 #endif
 
 #include <QActionGroup>
diff --git a/rpcs3/util/dyn_lib.hpp b/rpcs3/util/dyn_lib.hpp
index 9631e63840..dcd958a818 100644
--- a/rpcs3/util/dyn_lib.hpp
+++ b/rpcs3/util/dyn_lib.hpp
@@ -14,7 +14,7 @@ namespace utils
 
 		dynamic_library(const dynamic_library&) = delete;
 
-		dynamic_library(dynamic_library&& other)
+		dynamic_library(dynamic_library&& other) noexcept
 			: m_handle(other.m_handle)
 		{
 			other.m_handle = nullptr;
@@ -22,7 +22,7 @@ namespace utils
 
 		dynamic_library& operator=(const dynamic_library&) = delete;
 
-		dynamic_library& operator=(dynamic_library&& other)
+		dynamic_library& operator=(dynamic_library&& other) noexcept
 		{
 			std::swap(m_handle, other.m_handle);
 			return *this;