diff --git a/src/gfxstream/codegen/scripts/cereal/functable.py b/src/gfxstream/codegen/scripts/cereal/functable.py
index 725ff98a619..03e53180755 100644
--- a/src/gfxstream/codegen/scripts/cereal/functable.py
+++ b/src/gfxstream/codegen/scripts/cereal/functable.py
@@ -162,6 +162,7 @@ NON_AUTOGEN_ENTRYPOINTS = [
     "vkQueueSubmitAsync2GOOGLE",
     "vkGetSemaphoreGOOGLE",
     "vkTraceAsyncGOOGLE",
+    "vkSetDebugMetadataAsyncGOOGLE",
 ]
 
 # Handles that need to be translated to/from their corresponding gfxstream object types
diff --git a/src/gfxstream/guest/meson.build b/src/gfxstream/guest/meson.build
index 521486fad8c..2b22eb18952 100644
--- a/src/gfxstream/guest/meson.build
+++ b/src/gfxstream/guest/meson.build
@@ -13,7 +13,7 @@ endif
 #===============#
 # Configuration #
 #===============#
-gfxstream_guest_args = ['-D_FILE_OFFSET_BITS=64']
+gfxstream_guest_args = cpp_msvc_compat_args + ['-D_FILE_OFFSET_BITS=64']
 
 # Our internal guest build
 if host_machine.system() == 'windows'