diff --git a/Common/Render/Text/draw_text_uwp.cpp b/Common/Render/Text/draw_text_uwp.cpp
index 5d68e77610..322cb49ef0 100644
--- a/Common/Render/Text/draw_text_uwp.cpp
+++ b/Common/Render/Text/draw_text_uwp.cpp
@@ -41,7 +41,7 @@ public:
 			weight,
 			DWRITE_FONT_STYLE_NORMAL,
 			DWRITE_FONT_STRETCH_NORMAL,
-			MulDiv(height, (int)(96.0f * (1.0f / dpiScale)), 72),
+			MulDiv(height, (int)(96.0f * (1.0f / dpiScale)), 72.0f),
 			L"",
 			&textFmt
 		);
@@ -233,8 +233,8 @@ void TextDrawerUWP::MeasureString(const char *str, size_t len, float *w, float *
 		layout->Release();
 
 		entry = new TextMeasureEntry();
-		entry->width = metrics.width + 1;
-		entry->height = metrics.height + 1;
+		entry->width = metrics.width + 1.0f;
+		entry->height = metrics.height + 1.0f;
 		sizeCache_[key] = std::unique_ptr<TextMeasureEntry>(entry);
 	}
 
diff --git a/UWP/App.cpp b/UWP/App.cpp
index 3f693f42f4..aa850ae81a 100644
--- a/UWP/App.cpp
+++ b/UWP/App.cpp
@@ -260,11 +260,12 @@ void App::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEventArgs^ ar
 	float scale = m_deviceResources->GetDpi() / 96.0f;
 
 	m_deviceResources->SetLogicalSize(Size(width, height));
-	m_main->CreateWindowSizeDependentResources();
+	if (m_main) {
+		m_main->CreateWindowSizeDependentResources();
+	}
 
 	PSP_CoreParameter().pixelWidth = (int)(width * scale);
 	PSP_CoreParameter().pixelHeight = (int)(height * scale);
-
 	if (UpdateScreenScale((int)width, (int)height)) {
 		NativeMessageReceived("gpu_resized", "");
 	}