diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
index fe3722369c..cd6936d131 100644
--- a/GPU/Vulkan/TextureCacheVulkan.cpp
+++ b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -1341,7 +1341,7 @@ void TextureCacheVulkan::LoadTextureLevel(TexCacheEntry &entry, uint8_t *writePt
 		}
 
 		bool expand32 = !gstate_c.Supports(GPU_SUPPORTS_16BIT_FORMATS);
-				DecodeTextureLevel((u8 *)pixelData, decPitch, tfmt, clutformat, texaddr, level, bufw, false, false, expand32);
+		DecodeTextureLevel((u8 *)pixelData, decPitch, tfmt, clutformat, texaddr, level, bufw, false, false, expand32);
 		gpuStats.numTexturesDecoded++;
 
 		// We check before scaling since scaling shouldn't invent alpha from a full alpha texture.
diff --git a/ext/native/gfx_es2/draw_buffer.cpp b/ext/native/gfx_es2/draw_buffer.cpp
index e9ff42c8db..78eb6733ab 100644
--- a/ext/native/gfx_es2/draw_buffer.cpp
+++ b/ext/native/gfx_es2/draw_buffer.cpp
@@ -436,16 +436,19 @@ void DrawBuffer::MeasureTextCount(FontID font, const char *text, int count, floa
 
 void DrawBuffer::MeasureTextRect(FontID font_id, const char *text, int count, const Bounds &bounds, float *w, float *h, int align) {
 	if (!text || font_id.isInvalid()) {
-		*w = 0;
-		*h = 0;
+		*w = 0.0f;
+		*h = 0.0f;
 		return;
 	}
 
 	std::string toMeasure = std::string(text, count);
 	if (align & FLAG_WRAP_TEXT) {
 		const AtlasFont *font = atlas->getFont(font_id);
-		if (!font)
+		if (!font) {
+			*w = 0.0f;
+			*h = 0.0f;
 			return;
+		}
 		AtlasWordWrapper wrapper(*font, fontscalex, toMeasure.c_str(), bounds.w);
 		toMeasure = wrapper.Wrapped();
 	}
diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp
index 47dfc9e520..a00123b745 100644
--- a/ext/native/thin3d/thin3d_vulkan.cpp
+++ b/ext/native/thin3d/thin3d_vulkan.cpp
@@ -1350,10 +1350,8 @@ std::vector<std::string> VKContext::GetExtensionList() const {
 
 uint32_t VKContext::GetDataFormatSupport(DataFormat fmt) const {
 	VkFormat vulkan_format = DataFormatToVulkan(fmt);
-	// TODO: Actually do proper check
 	VkFormatProperties properties;
 	vkGetPhysicalDeviceFormatProperties(vulkan_->GetCurrentPhysicalDevice(), vulkan_format, &properties);
-
 	uint32_t flags = 0;
 	if (properties.optimalTilingFeatures & VkFormatFeatureFlagBits::VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) {
 		flags |= FMT_RENDERTARGET;