diff --git a/Core/Util/GameManager.h b/Core/Util/GameManager.h
index a1f0d67a7052..bf9cafdd668f 100644
--- a/Core/Util/GameManager.h
+++ b/Core/Util/GameManager.h
@@ -20,6 +20,8 @@
 //
 // Not concerned with full ISOs.
 
+#pragma once
+
 #include "net/http_client.h"
 
 class GameManager {
diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp
index dacde8580d9b..458918934893 100644
--- a/UI/InstallZipScreen.cpp
+++ b/UI/InstallZipScreen.cpp
@@ -23,7 +23,7 @@
 #include "UI/ui_atlas.h"
 #include "file/file_util.h"
 
-#include "Core/Util/GameManager.cpp"
+#include "Core/Util/GameManager.h"
 #include "UI/InstallZipScreen.h"
 
 void InstallZipScreen::CreateViews() {
diff --git a/UI/Store.cpp b/UI/Store.cpp
index e2f2b4a60afb..57148707d548 100644
--- a/UI/Store.cpp
+++ b/UI/Store.cpp
@@ -250,7 +250,7 @@ UI::EventReturn StoreScreen::OnRetry(UI::EventParams &e) {
 
 std::string StoreScreen::GetStoreJsonURL(std::string storePath) const {
 	std::string path = storeBaseUrl + storePath;
-	if (path.back() != '/')
+	if (*path.rbegin() != '/')
 		path += '/';
 	path += "index.json";
 	return path;