diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java
index ec192863abac..77686ee0bd87 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeDetectionService.java
@@ -730,7 +730,7 @@ final class FileTypeDetectionService implements Disposable {
 
   @TestOnly
   void drainReDetectQueue() {
-    ((CoroutineDispatcherBackedExecutor)reDetectExecutor).waitAllTasksExecuted(1, TimeUnit.MINUTES);
+    reDetectExecutor.waitAllTasksExecuted(1, TimeUnit.MINUTES);
   }
 
   @TestOnly
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
index e9544458fb38..ce5f01a6384a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
@@ -202,8 +202,8 @@ public final class RefreshQueueImpl extends RefreshQueue implements Disposable {
   }
 
   public static boolean isRefreshInProgress() {
-    var refreshQueue = (RefreshQueueImpl)RefreshQueue.getInstance();
-    return !refreshQueue.mySessions.isEmpty() || !((CoroutineDispatcherBackedExecutor)refreshQueue.myQueue).isEmpty();
+    var refreshQueue = (RefreshQueueImpl)getInstance();
+    return !refreshQueue.mySessions.isEmpty() || !refreshQueue.myQueue.isEmpty();
   }
 
   @TestOnly
diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
index ec79e4bd9a88..6ba3a917ebff 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/PermanentGraphImpl.java
@@ -18,7 +18,10 @@ import com.intellij.vcs.log.graph.impl.permanent.*;
 import com.intellij.vcs.log.graph.impl.print.GraphColorGetterByHeadFactory;
 import com.intellij.vcs.log.graph.linearBek.LinearBekController;
 import com.intellij.vcs.log.graph.utils.LinearGraphUtils;
-import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -202,7 +205,7 @@ public final class PermanentGraphImpl<CommitId> implements PermanentGraph<Commit
     PermanentCommitsInfoImpl<CommitId> permanentCommitsInfo = PermanentCommitsInfoImpl.newInstance(graphCommits,
                                                                                                    idsGenerator.getNotLoadedCommits());
 
-    GraphLayoutImpl permanentGraphLayout = GraphLayoutBuilder.build(linearGraph, (IntComparator)(nodeIndex1, nodeIndex2) -> {
+    GraphLayoutImpl permanentGraphLayout = GraphLayoutBuilder.build(linearGraph, (nodeIndex1, nodeIndex2) -> {
       CommitId commitId1 = permanentCommitsInfo.getCommitId(nodeIndex1);
       CommitId commitId2 = permanentCommitsInfo.getCommitId(nodeIndex2);
       return headCommitsComparator.compare(commitId1, commitId2);
diff --git a/python/python-psi-impl/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java b/python/python-psi-impl/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java
index 9dcb9ff22625..0a1527961107 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/debugger/PySignatureCacheManagerImpl.java
@@ -45,7 +45,7 @@ public final class PySignatureCacheManagerImpl extends PySignatureCacheManager {
     .build(
       new CacheLoader<>() {
         @Override
-        public String load(VirtualFile key) throws Exception {
+        public @NotNull String load(@NotNull VirtualFile key) {
           return readAttributeFromFile(key);
         }
       });
@@ -129,7 +129,7 @@ public final class PySignatureCacheManagerImpl extends PySignatureCacheManager {
   @Override
   @Nullable
   public String findParameterType(@NotNull PyAstFunction function, @NotNull String name) {
-    final PySignature signature = findSignature((PyFunction)function);
+    final PySignature signature = findSignature(function);
     if (signature != null) {
       return signature.getArgTypeQualifiedName(name);
     }