diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index 3fdf78ba9c..f4982fc894 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -455,12 +455,9 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *ctx)
 GPU_Vulkan::~GPU_Vulkan() {
 	framebufferManager_->DestroyAllFBOs();
 	depalShaderCache_.Clear();
+	delete framebufferManager_;
+	delete pipelineManager_;
 	delete shaderManager_;
-	shaderManager_ = nullptr;
-
-#ifdef _WIN32
-	gfxCtx_->SwapInterval(0);
-#endif
 }
 
 void GPU_Vulkan::CheckGPUFeatures() {
diff --git a/GPU/Vulkan/PipelineManagerVulkan.cpp b/GPU/Vulkan/PipelineManagerVulkan.cpp
index ef51bf6e9e..13f228b142 100644
--- a/GPU/Vulkan/PipelineManagerVulkan.cpp
+++ b/GPU/Vulkan/PipelineManagerVulkan.cpp
@@ -99,7 +99,7 @@ int SetupVertexAttribsPretransformed(VkVertexInputAttributeDescription attrs[],
 }
 
 static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pipelineCache, VkPipelineLayout layout, VkRenderPass renderPass, const VulkanPipelineRasterStateKey &key, const VertexDecoder *vtxDec, VulkanVertexShader *vs, VulkanFragmentShader *fs, bool useHwTransform) {
-	VkPipelineColorBlendAttachmentState blend0;
+	VkPipelineColorBlendAttachmentState blend0 = {};
 	blend0.blendEnable = key.blendEnable;
 	if (key.blendEnable) {
 		blend0.colorBlendOp = (VkBlendOp)key.blendOpColor;
@@ -110,10 +110,8 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 		blend0.dstAlphaBlendFactor = (VkBlendFactor)key.destAlpha;
 	}
 	blend0.colorWriteMask = key.colorWriteMask;
-	
-	VkPipelineColorBlendStateCreateInfo cbs;
-	cbs.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
-	cbs.pNext = nullptr;
+
+	VkPipelineColorBlendStateCreateInfo cbs = { VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO };
 	cbs.flags = 0;
 	cbs.pAttachments = &blend0;
 	cbs.attachmentCount = 1;
@@ -123,9 +121,7 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 	else
 		cbs.logicOp = VK_LOGIC_OP_COPY;
 
-	VkPipelineDepthStencilStateCreateInfo dss = { };
-	dss.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
-	dss.pNext = nullptr;
+	VkPipelineDepthStencilStateCreateInfo dss = { VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO };
 	dss.depthBoundsTestEnable = false;
 	dss.stencilTestEnable = key.stencilTestEnable;
 	if (key.stencilTestEnable) {
@@ -155,16 +151,12 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 		dynamicStates[numDyn++] = VK_DYNAMIC_STATE_STENCIL_WRITE_MASK;
 	}
 	
-	VkPipelineDynamicStateCreateInfo ds;
-	ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
-	ds.pNext = nullptr;
+	VkPipelineDynamicStateCreateInfo ds = { VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO };
 	ds.flags = 0;
 	ds.pDynamicStates = dynamicStates;
 	ds.dynamicStateCount = numDyn;
 	
-	VkPipelineRasterizationStateCreateInfo rs;
-	rs.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
-	rs.pNext = nullptr;
+	VkPipelineRasterizationStateCreateInfo rs = { VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO };
 	rs.flags = 0;
 	rs.depthBiasEnable = false;
 	rs.cullMode = key.cullMode;
@@ -174,10 +166,7 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 	rs.polygonMode = VK_POLYGON_MODE_FILL;
 	rs.depthClampEnable = false;
 
-	VkPipelineMultisampleStateCreateInfo ms;
-	memset(&ms, 0, sizeof(ms));
-	ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
-	ms.pNext = nullptr;
+	VkPipelineMultisampleStateCreateInfo ms = { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO };
 	ms.pSampleMask = nullptr;
 	ms.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
 
@@ -202,9 +191,7 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 		return nullptr;
 	}
 
-	VkPipelineInputAssemblyStateCreateInfo inputAssembly;
-	inputAssembly.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
-	inputAssembly.pNext = nullptr;
+	VkPipelineInputAssemblyStateCreateInfo inputAssembly = { VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO };
 	inputAssembly.flags = 0;
 	inputAssembly.topology = (VkPrimitiveTopology)key.topology;
 	inputAssembly.primitiveRestartEnable = false;
@@ -227,27 +214,21 @@ static VulkanPipeline *CreateVulkanPipeline(VkDevice device, VkPipelineCache pip
 	ibd.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
 	ibd.stride = vertexStride;
 
-	VkPipelineVertexInputStateCreateInfo vis;
-	vis.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
-	vis.pNext = nullptr;
+	VkPipelineVertexInputStateCreateInfo vis = { VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO };
 	vis.flags = 0;
 	vis.vertexBindingDescriptionCount = 1;
 	vis.pVertexBindingDescriptions = &ibd;
 	vis.vertexAttributeDescriptionCount = attributeCount;
 	vis.pVertexAttributeDescriptions = attrs;
 
-	VkPipelineViewportStateCreateInfo views;
-	views.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
-	views.pNext = nullptr;
+	VkPipelineViewportStateCreateInfo views = { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO };
 	views.flags = 0;
 	views.viewportCount = 1;
 	views.scissorCount = 1;
 	views.pViewports = nullptr;  // dynamic
 	views.pScissors = nullptr;  // dynamic
 
-	VkGraphicsPipelineCreateInfo pipe;
-	pipe.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
-	pipe.pNext = nullptr;
+	VkGraphicsPipelineCreateInfo pipe = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO };
 	pipe.flags = 0;
 	pipe.stageCount = 2;
 	pipe.pStages = ss;
diff --git a/GPU/Vulkan/StateMappingVulkan.h b/GPU/Vulkan/StateMappingVulkan.h
index 8bb8aa0a07..0f907bc649 100644
--- a/GPU/Vulkan/StateMappingVulkan.h
+++ b/GPU/Vulkan/StateMappingVulkan.h
@@ -29,6 +29,7 @@ struct VulkanPipelineRasterStateKey {
 	unsigned int destColor : 5;  // VkBlendFactor
 	unsigned int srcAlpha : 5;  // VkBlendFactor
 	unsigned int destAlpha : 5;  // VkBlendFactor
+	// bool useBlendConstant : 1;  // sacrifice a bit to cheaply check if we need to update the blend color
 	unsigned int blendOpColor : 3;  // VkBlendOp
 	unsigned int blendOpAlpha : 3;  // VkBlendOp
 	bool logicOpEnable : 1;
diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
index c4695fb6bb..25a3cfc1a7 100644
--- a/GPU/Vulkan/TextureCacheVulkan.cpp
+++ b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -1266,8 +1266,6 @@ void TextureCacheVulkan::SetTexture() {
 				gstate_c.textureFullAlpha = entry->GetAlphaStatus() == TexCacheEntry::STATUS_ALPHA_FULL;
 				gstate_c.textureSimpleAlpha = entry->GetAlphaStatus() != TexCacheEntry::STATUS_ALPHA_UNKNOWN;
 			}
-			gstate_c.curTextureWidth = w;
-			gstate_c.curTextureHeight = h;
 			nextTexture_ = entry;
 			VERBOSE_LOG(G3D, "Texture at %08x Found in Cache, applying", texaddr);
 			return; //Done!
@@ -1458,13 +1456,8 @@ void TextureCacheVulkan::SetTexture() {
 	}
 	lastBoundTexture = entry->vkTex;
 
-	// GLES2 doesn't have support for a "Max lod" which is critical as PSP games often
-	// don't specify mips all the way down. As a result, we either need to manually generate
-	// the bottom few levels or rely on OpenGL's autogen mipmaps instead, which might not
-	// be as good quality as the game's own (might even be better in some cases though).
-
-	// Always load base level texture here 
-	
+	// In Vulkan, fortunately, we have full control over mipmapping.
+	// For now, we only load the base texture. More to come.
 	LoadTextureLevel(*entry, 0, replaceImages, scaleFactor, dstFmt);
 
 	// Mipmapping only enable when texture scaling disable