diff --git a/meson_to_hermetic/generate_python_build.py b/meson_to_hermetic/generate_python_build.py
index c9942122a36..8ad89408884 100644
--- a/meson_to_hermetic/generate_python_build.py
+++ b/meson_to_hermetic/generate_python_build.py
@@ -66,7 +66,7 @@ def process_meson(file_name: str, output_indent: str = ''):
             exit('Unhandled literal in line: ' + line)
 
         # Recurse into subdirs
-        match = re.match("( *)subdir\('([a-zA-Z0-9_/]+)'\)", line)
+        match = re.match("( *)subdir\('([a-zA-Z0-9_\-/]+)'\)", line)
         if match is not None:
             subdir_output_indent = match.group(1) + output_indent
             current_dir = os.path.dirname(file_name)
diff --git a/meson_to_hermetic/templates/defaults/mesa_common_headers.txt b/meson_to_hermetic/templates/defaults/mesa_common_headers.txt
index b3f474d83ca..0156df6c49e 100644
--- a/meson_to_hermetic/templates/defaults/mesa_common_headers.txt
+++ b/meson_to_hermetic/templates/defaults/mesa_common_headers.txt
@@ -4,7 +4,7 @@
 cc_library_headers {
     name: "mesa_common_headers",
     vendor_available: true,
-    host_supported: true,
+    host_supported: false,
     export_include_dirs: [
         "src",
         "include",
diff --git a/meson_to_hermetic/templates/defaults/mesa_gfxstream_guest_cc.txt b/meson_to_hermetic/templates/defaults/mesa_gfxstream_guest_cc.txt
index c13b9eb3ab0..fb8e3038ca8 100644
--- a/meson_to_hermetic/templates/defaults/mesa_gfxstream_guest_cc.txt
+++ b/meson_to_hermetic/templates/defaults/mesa_gfxstream_guest_cc.txt
@@ -3,7 +3,7 @@
 #}
 cc_defaults {
     name: "mesa_gfxstream_guest_cc_defaults",
-    host_supported: true,
+    host_supported: false,
     vendor: true,
     cflags: [
         "-DVK_GFXSTREAM_STRUCTURE_TYPE_EXT",