diff --git a/flags/BUILD b/flags/BUILD
index db3d058..4d2ba49 100644
--- a/flags/BUILD
+++ b/flags/BUILD
@@ -167,7 +167,6 @@
 string_flag(
     name = "android_manifest_merger",
     build_setting_default = "android",
-    scope = "universal",
     values = [
         "legacy",
         "android",
diff --git a/flags/flags_wrapper.bzl b/flags/flags_wrapper.bzl
index f82e922..1787747 100644
--- a/flags/flags_wrapper.bzl
+++ b/flags/flags_wrapper.bzl
@@ -34,7 +34,7 @@
 flags_wrapper = rule(
     implementation = _flags_wrapper_impl,
     attrs = dict(
-        targets = attr.label_list(),
+        targets = attr.label_list(allow_files = True),
     ),
 )
 
diff --git a/rules/flags/flags.bzl b/rules/flags/flags.bzl
index 8804429..1b02122 100644
--- a/rules/flags/flags.bzl
+++ b/rules/flags/flags.bzl
@@ -194,47 +194,47 @@
         lambda ctx: ctx.fragments.android.manifest_merger,
         "native",
     ),
-    "desugar_for_android": (lambda ctx: ctx.fragments.android.desugar_java8, "native"),
-    "desugar_java8_libs": (lambda ctx: ctx.fragments.android.desugar_java8_libs, "native"),
+    "desugar_for_android": (lambda ctx: ctx.fragments.android.desugar_java8, "starlark"),
+    "desugar_java8_libs": (lambda ctx: ctx.fragments.android.desugar_java8_libs, "starlark"),
     "experimental_android_compress_java_resources": (
         lambda ctx: ctx.fragments.android.compress_java_resources,
-        "native",
+        "starlark",
     ),
     "experimental_android_library_exports_manifest_default": (
         lambda ctx: ctx.fragments.android.get_exports_manifest_default,
-        "native",
+        "starlark",
     ),
     "experimental_android_resource_cycle_shrinking": (
         lambda ctx: ctx.fragments.android.use_android_resource_cycle_shrinking,
-        "native",
+        "starlark",
     ),
     "experimental_get_android_java_resources_from_optimized_jar": (
         lambda ctx: ctx.fragments.android.get_java_resources_from_optimized_jar,
-        "native",
+        "starlark",
     ),
     "internal_persistent_android_dex_desugar": (
         lambda ctx: ctx.fragments.android.persistent_android_dex_desugar,
-        "native",
+        "starlark",
     ),
     "internal_persistent_busybox_tools": (
         lambda ctx: ctx.fragments.android.persistent_busybox_tools,
-        "native",
+        "starlark",
     ),
     "internal_persistent_multiplex_android_dex_desugar": (
         lambda ctx: ctx.fragments.android.persistent_multiplex_android_dex_desugar,
-        "native",
+        "starlark",
     ),
     "internal_persistent_multiplex_busybox_tools": (
         lambda ctx: ctx.fragments.android.persistent_multiplex_busybox_tools,
-        "native",
+        "starlark",
     ),
-    "experimental_incremental_dexing_after_proguard": (lambda ctx: ctx.fragments.android.incremental_dexing_shards_after_proguard, "native"),
-    "dexopts_supported_in_dexsharder": (lambda ctx: ctx.fragments.android.get_dexopts_supported_in_dex_sharder, "native"),
-    "fixed_resource_neverlinking": (lambda ctx: ctx.fragments.android.fixed_resource_neverlinking, "native"),
-    "android_resource_shrinking": (lambda ctx: ctx.fragments.android.use_android_resource_shrinking, "native"),
-    "experimental_android_resource_shrinking": (lambda ctx: ctx.fragments.android.use_android_resource_shrinking, "native"),
-    "experimental_android_resource_path_shortening": (lambda ctx: ctx.fragments.android.use_android_resource_path_shortening, "native"),
-    "experimental_android_resource_name_obfuscation": (lambda ctx: ctx.fragments.android.use_android_resource_name_obfuscation, "native"),
+    "experimental_incremental_dexing_after_proguard": (lambda ctx: ctx.fragments.android.incremental_dexing_shards_after_proguard, "starlark"),
+    "dexopts_supported_in_dexsharder": (lambda ctx: ctx.fragments.android.get_dexopts_supported_in_dex_sharder, "starlark"),
+    "fixed_resource_neverlinking": (lambda ctx: ctx.fragments.android.fixed_resource_neverlinking, "starlark"),
+    "android_resource_shrinking": (lambda ctx: ctx.fragments.android.use_android_resource_shrinking, "starlark"),
+    "experimental_android_resource_shrinking": (lambda ctx: ctx.fragments.android.use_android_resource_shrinking, "starlark"),
+    "experimental_android_resource_path_shortening": (lambda ctx: ctx.fragments.android.use_android_resource_path_shortening, "starlark"),
+    "experimental_android_resource_name_obfuscation": (lambda ctx: ctx.fragments.android.use_android_resource_name_obfuscation, "starlark"),
     "optimizing_dexer": (lambda ctx: ctx.attr._optimizing_dexer, "native"),
 }