diff --git a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
index a31d5c4c13e..3c5c62d1028 100644
--- a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
+++ b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
@@ -138,7 +138,7 @@ SNAPSHOT_HANDLE_DEPENDENCIES = [
 handleDependenciesDict = dict(SNAPSHOT_HANDLE_DEPENDENCIES)
 
 def extract_deps_vkAllocateMemory(param, access, lenExpr, api, cgen):
-    cgen.stmt("const VkMemoryDedicatedAllocateInfo* dedicatedAllocateInfo = vk_find_struct_const(pAllocateInfo, MEMORY_DEDICATED_ALLOCATE_INFO)");
+    cgen.stmt("const VkMemoryDedicatedAllocateInfo* dedicatedAllocateInfo = vk_find_struct<VkMemoryDedicatedAllocateInfo>(pAllocateInfo)");
     cgen.beginIf("dedicatedAllocateInfo");
     cgen.beginIf("dedicatedAllocateInfo->image")
     cgen.stmt("mReconstruction.addHandleDependency((const uint64_t*)%s, %s, (uint64_t)(uintptr_t)%s)" % \
diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
index 96862436a8f..9716114458a 100644
--- a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
+++ b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
@@ -391,6 +391,7 @@ void gfxstream_vk_DestroyInstance(VkInstance _instance, const VkAllocationCallba
     // To make End2EndTests happy, since now the host connection is statically linked to
     // libvulkan_ranchu.so [separate HostConnections now].
 #if defined(END2END_TESTS)
+    GfxStreamConnectionManager* mgr = getConnectionManager();
     mgr->threadLocalExit();
     VirtGpuDevice::resetInstance();
     gSeqno = 0;
diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index edf3fc712a5..7beb948d219 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -7246,7 +7246,7 @@ VkResult ResourceTracker::on_vkAllocateCommandBuffers(
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR)
 VkResult ResourceTracker::exportSyncFdForQSRILocked(VkImage image, int* fd) {
-    mesa_logd("%s: call for image %p hos timage handle 0x%llx\n", __func__, (void*)image,
+    mesa_logd("%s: call for image %p host image handle 0x%llx\n", __func__, (void*)image,
               (unsigned long long)get_host_u64_VkImage(image));
 
     if (mFeatureInfo.hasVirtioGpuNativeSync) {