diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 5cb7ac99f..9880bac3a 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -7023,11 +7023,11 @@ VkResult WrappedVulkan::vkCreateSwapChainWSI(
 
 						GetResourceManager()->WrapResource(Unwrap(device), swapImInfo.view);
 
-						VkAttachmentBindInfo attBind = { swapImInfo.view, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+						VkAttachmentBindInfo attBind = { Unwrap(swapImInfo.view), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
 
 						VkFramebufferCreateInfo fbinfo = {
 							VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, NULL,
-							swapInfo.rp,
+							Unwrap(swapInfo.rp),
 							1, &attBind,
 							(uint32_t)pCreateInfo->imageExtent.width, (uint32_t)pCreateInfo->imageExtent.height, 1,
 						};
diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp
index ca39ceab0..054ccd4e2 100644
--- a/renderdoc/driver/vulkan/vk_debug.cpp
+++ b/renderdoc/driver/vulkan/vk_debug.cpp
@@ -941,7 +941,7 @@ void VulkanDebugManager::RenderText(const TextPrintState &textstate, float x, fl
 
 void VulkanDebugManager::RenderTextInternal(const TextPrintState &textstate, float x, float y, const char *text)
 {
-	const VkLayerDispatchTable *vt = ObjDisp(m_Device);
+	const VkLayerDispatchTable *vt = ObjDisp(textstate.cmd);
 
 	// VKTODOMED needs to be optimised to do all in one cmd buffer with
 	// a start/stop pair of calls that map a UBO, then do each draw with
@@ -989,7 +989,6 @@ void VulkanDebugManager::RenderTextInternal(const TextPrintState &textstate, flo
 		};
 		vt->CmdBeginRenderPass(Unwrap(textstate.cmd), &rpbegin, VK_RENDER_PASS_CONTENTS_INLINE);
 
-		// VKTODOMED will need a way to disable blend for other things
 		vt->CmdBindPipeline(Unwrap(textstate.cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_TextPipeline));
 		vt->CmdBindDescriptorSets(Unwrap(textstate.cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_TextPipeLayout), 0, 1, UnwrapPtr(m_TextDescSet), 0, NULL);