diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java
index dad18ce47c2c..5634daff5332 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java
@@ -1,7 +1,7 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.model.java.impl;
 
-import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.util.text.Strings;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -134,12 +134,12 @@ public class JpsJavaExtensionServiceImpl extends JpsJavaExtensionService {
       properties instanceof JavaSourceRootProperties ? ((JavaSourceRootProperties)properties).getPackagePrefix().replace('.', '/') :
       properties instanceof JavaResourceRootProperties ? ((JavaResourceRootProperties)properties).getRelativeOutputPath() : "";
 
-    var normalizedPrefix = StringUtil.trimStart(prefix, "/");
+    var normalizedPrefix = Strings.trimStart(prefix, "/");
     if (!normalizedPrefix.isEmpty() && !normalizedPrefix.endsWith("/")) {
       normalizedPrefix += "/";
     }
 
-    var normalizedRelativePath = StringUtil.trimStart(relativePath, "/");
+    var normalizedRelativePath = Strings.trimStart(relativePath, "/");
     if (normalizedRelativePath.startsWith(normalizedPrefix)) {
       var result = root.getPath().resolve(normalizedRelativePath.substring(normalizedPrefix.length()));
       if (Files.exists(result)) {
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt
index f5ee999c7a85..3554ff930520 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt
@@ -382,7 +382,7 @@ abstract class ProductProperties {
    * @return specification of programmatic content modules, or null to use only XML-based includes
    * @see org.jetbrains.intellij.build.productLayout.ProductModulesContentSpec
    */
-  open fun getProductContentDescriptor(): ProductModulesContentSpec? = null
+  abstract fun getProductContentDescriptor(): ProductModulesContentSpec?
 
   /**
    * @return custom properties for [com.intellij.platform.buildData.productInfo.ProductInfoData].
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesContentSpec.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesContentSpec.kt
index 4313e18f5717..f4024104ca95 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesContentSpec.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesContentSpec.kt
@@ -160,8 +160,8 @@ class ProductModulesContentSpecBuilder @PublishedApi internal constructor() {
       deprecatedXmlIncludes = java.util.List.copyOf(xmlIncludes),
       moduleSets = java.util.List.copyOf(moduleSets),
       additionalModules = java.util.List.copyOf(additionalModules),
-      excludedModules = excludedModules,
-      moduleLoadingOverrides = loadingOverrides,
+      excludedModules = java.util.Set.copyOf(excludedModules),
+      moduleLoadingOverrides = java.util.Map.copyOf(loadingOverrides),
     )
   }
 }