diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
index 588e8eb7fb..d2973abb5a 100644
--- a/Common/GPU/Vulkan/VulkanRenderManager.cpp
+++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -1409,7 +1409,6 @@ void VulkanRenderManager::Run(int frame) {
 	BeginSubmitFrame(frame);
 
 	FrameData &frameData = frameData_[frame];
-	VkCommandBuffer cmd = frameData.mainCmd;
 	queueRunner_.PreprocessSteps(frameData_[frame].steps);
 	//queueRunner_.LogSteps(stepsOnThread, false);
 	queueRunner_.RunSteps(frameData);
diff --git a/UI/InstallZipScreen.h b/UI/InstallZipScreen.h
index 2f705b5510..140b82fec2 100644
--- a/UI/InstallZipScreen.h
+++ b/UI/InstallZipScreen.h
@@ -30,7 +30,7 @@ public:
 	virtual void update() override;
 	virtual bool key(const KeyInput &key) override;
 
-	const char *tag() const override { return "install_zip"; }
+	const char *tag() const override { return "InstallZip"; }
 
 protected:
 	virtual void CreateViews() override;
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 3e025d06ba..d5ed3ab0a4 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -1432,11 +1432,12 @@ UI::EventReturn MainScreen::OnExit(UI::EventParams &e) {
 }
 
 void MainScreen::dialogFinished(const Screen *dialog, DialogResult result) {
-	if (dialog->tag() == "store") {
+	std::string tag = dialog->tag();
+	if (tag == "Store") {
 		backFromStore_ = true;
 		RecreateViews();
 	}
-	if (dialog->tag() == "game") {
+	if (tag == "Game") {
 		if (!restoreFocusGamePath_.empty() && UI::IsFocusMovementEnabled()) {
 			// Prevent the background from fading, since we just were displaying it.
 			highlightedGamePath_ = restoreFocusGamePath_;
diff --git a/UI/MemStickScreen.h b/UI/MemStickScreen.h
index 6cab2a34a4..378f4f3ed0 100644
--- a/UI/MemStickScreen.h
+++ b/UI/MemStickScreen.h
@@ -36,7 +36,7 @@ public:
 	MemStickScreen(bool initialSetup);
 	~MemStickScreen() {}
 
-	const char *tag() const override { return "memstick"; }
+	const char *tag() const override { return "MemStick"; }
 
 	enum Choice {
 		CHOICE_BROWSE_FOLDER,
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 2a0ea9bfe7..d90d92f76d 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -387,13 +387,13 @@ void HandleCommonMessages(const char *message, const char *value, ScreenManager
 				MIPSComp::jit->ClearCache();
 		}
 		currentMIPS->UpdateCore((CPUCore)g_Config.iCpuCore);
-	} else if (!strcmp(message, "control mapping") && isActiveScreen && activeScreen->tag() != "control mapping") {
+	} else if (!strcmp(message, "control mapping") && isActiveScreen && std::string(activeScreen->tag()) != "ControlMapping") {
 		UpdateUIState(UISTATE_MENU);
 		manager->push(new ControlMappingScreen());
-	} else if (!strcmp(message, "display layout editor") && isActiveScreen && activeScreen->tag() != "display layout screen") {
+	} else if (!strcmp(message, "display layout editor") && isActiveScreen && std::string(activeScreen->tag()) != "DisplayLayout") {
 		UpdateUIState(UISTATE_MENU);
 		manager->push(new DisplayLayoutScreen());
-	} else if (!strcmp(message, "settings") && isActiveScreen && activeScreen->tag() != "settings") {
+	} else if (!strcmp(message, "settings") && isActiveScreen && std::string(activeScreen->tag()) != "GameSettings") {
 		UpdateUIState(UISTATE_MENU);
 		manager->push(new GameSettingsScreen(Path()));
 	} else if (!strcmp(message, "language screen") && isActiveScreen) {
diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp
index f358fa1e06..748fcdf86d 100644
--- a/UI/PauseScreen.cpp
+++ b/UI/PauseScreen.cpp
@@ -172,7 +172,7 @@ public:
 		return slot_;
 	}
 
-	const char *tag() const override { return "screenshot_view"; }
+	const char *tag() const override { return "ScreenshotView"; }
 
 protected:
 	bool FillVertical() const override { return false; }
@@ -458,7 +458,7 @@ UI::EventReturn GamePauseScreen::OnState(UI::EventParams &e) {
 
 void GamePauseScreen::dialogFinished(const Screen *dialog, DialogResult dr) {
 	std::string tag = dialog->tag();
-	if (tag == "screenshot" && dr == DR_OK) {
+	if (tag == "ScreenshotView" && dr == DR_OK) {
 		finishNextFrame_ = true;
 	} else {
 		// There may have been changes to our savestates, so let's recreate.