diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariantFactories.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariantFactories.kt
index 1db5b3e7e7b..44570f1b4e9 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariantFactories.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariantFactories.kt
@@ -78,8 +78,8 @@ abstract class AbstractKotlinGradleVariantFactory<T : KotlinGradleVariant>(
             isCanBeConsumed = false
             module.ifMadePublic {
                 isCanBeConsumed = true
-                setModuleCapability(this, fragment.containingModule)
             }
+            setModuleCapability(this, fragment.containingModule)
             attributes.attribute<Usage>(Usage.USAGE_ATTRIBUTE, KotlinUsages.producerApiUsage(project, fragment.platformType))
             extendsFrom(project.configurations.getByName(fragment.transitiveApiConfigurationName))
             // FIXME + compileOnly
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt
index 6e26012cb29..b9db8bc69ac 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt
@@ -43,6 +43,7 @@ internal fun configureMetadataResolutionAndBuild(module: KotlinGradleModule) {
 internal fun configureMetadataExposure(module: KotlinGradleModule) {
     val project = module.project
     project.configurations.create(metadataElementsConfigurationName(module)).apply {
+        isCanBeConsumed = false
         module.ifMadePublic {
             isCanBeConsumed = true
         }
@@ -117,6 +118,9 @@ private fun configureMetadataJarTask(
 ) {
     val project = module.project
     val allMetadataJar = project.registerTask<Jar>(metadataJarName(module)) { task ->
+        if (module.moduleClassifier != null) {
+            task.archiveClassifier.set(module.moduleClassifier)
+        }
         task.archiveAppendix.set("metadata")
         task.from()
     }