diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp
index 320c845d30..d17e392061 100644
--- a/UI/ReportScreen.cpp
+++ b/UI/ReportScreen.cpp
@@ -154,7 +154,7 @@ void CompatRatingChoice::SetupChoices() {
 }
 
 ReportScreen::ReportScreen(const std::string &gamePath)
-	: UIScreenWithGameBackground(gamePath), overall_(-1), graphics_(-1), speed_(-1), gameplay_(-1),
+	: UIDialogScreenWithGameBackground(gamePath), overall_(-1), graphics_(-1), speed_(-1), gameplay_(-1),
 	includeScreenshot_(true) {
 	enableReporting_ = Reporting::IsEnabled();
 	ratingEnabled_ = enableReporting_;
@@ -168,7 +168,7 @@ void ReportScreen::update() {
 			screenshot_->SetVisibility(V_GONE);
 		}
 	}
-	UIScreenWithGameBackground::update();
+	UIDialogScreenWithGameBackground::update();
 }
 
 EventReturn ReportScreen::HandleChoice(EventParams &e) {
diff --git a/UI/ReportScreen.h b/UI/ReportScreen.h
index 74d4aab703..abbd4b522f 100644
--- a/UI/ReportScreen.h
+++ b/UI/ReportScreen.h
@@ -23,7 +23,7 @@
 #include "ui/viewgroup.h"
 #include "UI/MiscScreens.h"
 
-class ReportScreen : public UIScreenWithGameBackground {
+class ReportScreen : public UIDialogScreenWithGameBackground {
 public:
 	ReportScreen(const std::string &gamePath);
 
diff --git a/Windows/GEDebugger/TabState.cpp b/Windows/GEDebugger/TabState.cpp
index 3b1bc8b444..26f27294e5 100644
--- a/Windows/GEDebugger/TabState.cpp
+++ b/Windows/GEDebugger/TabState.cpp
@@ -375,7 +375,11 @@ void FormatStateRow(wchar_t *dest, const TabStateRow &info, u32 value, bool enab
 			};
 			if (value < (u32)ARRAY_SIZE(texformats)) {
 				swprintf(dest, L"%S", texformats[value]);
-			} else {
+			}
+			else if ((value & 0xF) < (u32)ARRAY_SIZE(texformats)) {
+				swprintf(dest, L"%S (extra bits %06x)", texformats[value & 0xF], value);
+			}
+			else {
 				swprintf(dest, L"%06x", value);
 			}
 		}