diff --git a/platform/inspect/src/com/intellij/codeInspection/InspectionApplicationBase.java b/platform/inspect/src/com/intellij/codeInspection/InspectionApplicationBase.java
index e785bf5ae7d8..b4da7d91ea3d 100644
--- a/platform/inspect/src/com/intellij/codeInspection/InspectionApplicationBase.java
+++ b/platform/inspect/src/com/intellij/codeInspection/InspectionApplicationBase.java
@@ -218,7 +218,7 @@ public class InspectionApplicationBase implements CommandLineInspectionProgressR
     runAnalysisOnScope(projectPath, parentDisposable, project, myInspectionProfile, scope);
   }
 
-  private final @Nullable Project openProject(@NotNull Path projectPath, @NotNull Disposable parentDisposable)
+  private @Nullable Project openProject(@NotNull Path projectPath, @NotNull Disposable parentDisposable)
     throws InterruptedException, ExecutionException {
     VirtualFile vfsProject = LocalFileSystem.getInstance().refreshAndFindFileByPath(
       FileUtil.toSystemIndependentName(projectPath.toString()));
diff --git a/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java b/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java
index 8c68adcfb8a7..d8277da314e9 100644
--- a/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java
+++ b/platform/platform-api/src/com/intellij/ui/mac/screenmenu/Menu.java
@@ -82,7 +82,7 @@ public class Menu extends MenuItem {
       return "";
 
     TextWithMnemonic txt = TextWithMnemonic.parse(src);
-    return txt == null ? "" : txt.getText();
+    return txt.getText();
   }
 
   public static void renameAppMenuItems() {
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
index 1b3882d6a15e..7dcc0fce2148 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
@@ -43,11 +43,12 @@ public class ActionsTest extends IntegrationTestCase {
     a.finish();
 
     List<Revision> rr = getRevisionsFor(f);
-    assertEquals("current: doc2\n" +
-                 "action: doc1\n" +
-                 "null: file2\n" +
-                 "null: file1\n" +
-                 "External change: null", getNameAndOldContent(rr));
+    assertEquals("""
+                   current: doc2
+                   action: doc1
+                   null: file2
+                   null: file1
+                   External change: null""", getNameAndOldContent(rr));
   }
 
   /**
@@ -67,11 +68,12 @@ public class ActionsTest extends IntegrationTestCase {
     }, "command", null);
 
     List<Revision> rr = getRevisionsFor(f);
-    assertEquals("current: doc2\n" +
-                 "command: doc1\n" +
-                 "null: initial\n" +
-                 "null: \n" +
-                 "External change: null", getNameAndOldContent(rr));
+    assertEquals("""
+                   current: doc2
+                   command: doc1
+                   null: initial
+                   null:\s
+                   External change: null""", getNameAndOldContent(rr));
   }
 
   public void testActionInsideCommandSurroundedWithSomeChanges() throws Exception {
@@ -94,10 +96,11 @@ public class ActionsTest extends IntegrationTestCase {
     }, "command", null);
 
     List<Revision> rr = getRevisionsFor(f);
-    assertEquals("current: doc3\n" +
-                 "command: doc1\n" +
-                 "null: \n" +
-                 "External change: null", getNameAndOldContent(rr));
+    assertEquals("""
+                   current: doc3
+                   command: doc1
+                   null:\s
+                   External change: null""", getNameAndOldContent(rr));
   }
 
   private static @NotNull String getNameAndOldContent(@NotNull List<Revision> revisions) {
diff --git a/plugins/search-everywhere-ml/src/com/intellij/searchEverywhereMl/SearchEverywhereMlExperiment.kt b/plugins/search-everywhere-ml/src/com/intellij/searchEverywhereMl/SearchEverywhereMlExperiment.kt
index b56361edd821..95eb50147d6d 100644
--- a/plugins/search-everywhere-ml/src/com/intellij/searchEverywhereMl/SearchEverywhereMlExperiment.kt
+++ b/plugins/search-everywhere-ml/src/com/intellij/searchEverywhereMl/SearchEverywhereMlExperiment.kt
@@ -75,6 +75,7 @@ class SearchEverywhereMlExperiment {
 
   fun isLoggingEnabledForTab(tabId: String) = tabsWithEnabledLogging.contains(tabId)
 
+  @Suppress("UnresolvedPluginConfigReference")
   private fun isDisableExperiments(tab: SearchEverywhereTabWithMlRanking): Boolean {
     return Registry.`is`("search.everywhere.force.disable.experiment.${tab.name.lowercase()}.ml")
   }