diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt
index fcf0b3a63fc..76add8f034d 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.impl.compiled.*
 import com.intellij.psi.util.MethodSignatureUtil
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 
-class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigationPolicyEx() {
+class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigationPolicy {
     override fun getNavigationElement(clsClass: ClsClassImpl): PsiClass? {
         val containingClass = clsClass.containingClass as? ClsClassImpl
         if (containingClass != null) {
@@ -31,13 +31,13 @@ class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigation
         }
 
         val clsFileImpl = clsClass.containingFile as? ClsFileImpl ?: return null
-        return getFileNavigationElement(clsFileImpl)?.classes?.singleOrNull()
+        return (getNavigationElement(clsFileImpl) as? PsiClassOwner)?.classes?.singleOrNull()
     }
 
     override fun getNavigationElement(clsMethod: ClsMethodImpl): PsiElement? {
         val clsClass = getNavigationElement(clsMethod.containingClass as ClsClassImpl) ?: return null
         return clsClass.findMethodsByName(clsMethod.name, false)
-                .firstOrNull { MethodSignatureUtil.areParametersErasureEqual(it, clsMethod) }
+            .firstOrNull { MethodSignatureUtil.areParametersErasureEqual(it, clsMethod) }
     }
 
     override fun getNavigationElement(clsField: ClsFieldImpl): PsiElement? {
@@ -45,7 +45,7 @@ class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigation
         return srcClass.findFieldByName(clsField.name, false)
     }
 
-    override fun getFileNavigationElement(file: ClsFileImpl): PsiClassOwner? {
+    override fun getNavigationElement(file: ClsFileImpl): PsiElement? {
         val virtualFile = file.virtualFile
         val project = file.project
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt
index c70f07db87b..e69a00a0fa7 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt
@@ -10,7 +10,7 @@ import com.intellij.execution.actions.ConfigurationFromContext
 import com.intellij.execution.configurations.ConfigurationFactory
 import com.intellij.execution.junit.JUnitConfiguration
 import com.intellij.execution.junit.PatternConfigurationProducer
-import com.intellij.execution.junit.TestClassConfigurationProducer
+import com.intellij.execution.testframework.AbstractInClassConfigurationProducer
 import com.intellij.openapi.util.Ref
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.PsiElementProcessor
@@ -42,7 +42,7 @@ class KotlinPatternConfigurationProducer : PatternConfigurationProducer() {
 
     override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean {
         return other.isProducedBy(PatternConfigurationProducer::class.java)
-                || other.isProducedBy(TestClassConfigurationProducer::class.java)
+                || other.isProducedBy(AbstractInClassConfigurationProducer::class.java)
                 || other.isProducedBy(KotlinJUnitRunConfigurationProducer::class.java)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
index e139b59cab9..9ad9f3115b9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeTreeStructure.kt
@@ -11,9 +11,9 @@ import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor
 import com.intellij.ide.hierarchy.call.CalleeMethodsTreeStructure
 import com.intellij.ide.util.treeView.NodeDescriptor
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 import com.intellij.util.ArrayUtil
-import com.intellij.util.containers.HashMap
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest
@@ -41,7 +41,7 @@ class KotlinCalleeTreeStructure(
 
     override fun buildChildren(nodeDescriptor: HierarchyNodeDescriptor): Array<Any> {
         if (nodeDescriptor is CallHierarchyNodeDescriptor) {
-            val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
+            val psiMethod: PsiMember = nodeDescriptor.enclosingElement as? PsiMethod ?: return ArrayUtil.EMPTY_OBJECT_ARRAY
             return CalleeMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor)
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
index d4969d68851..f0490914cc7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerTreeStructure.kt
@@ -65,7 +65,7 @@ class KotlinCallerTreeStructure(
         callerToDescriptorMap: MutableMap<PsiElement, NodeDescriptor<*>>
     ): Collection<Any> {
         if (nodeDescriptor is CallHierarchyNodeDescriptor) {
-            val psiMethod = nodeDescriptor.enclosingElement as? PsiMethod ?: return emptyList()
+            val psiMethod: PsiMember = nodeDescriptor.enclosingElement as? PsiMethod ?: return emptyList()
             return CallerMethodsTreeStructure(myProject, psiMethod, scopeType).getChildElements(nodeDescriptor).toList()
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
index 0aa204f5466..ae44a8a77a1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.facet.KotlinFacet
 import org.jetbrains.kotlin.idea.framework.isGradleModule
 import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.platform.js.isJs
-import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
+import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
 
 val Module.jsTestOutputFilePath: String?
     get() {
@@ -50,4 +50,4 @@ val Module.jsProductionOutputFilePath: String?
 fun Module.asJsModule(): Module? = takeIf { it.platform.isJs() }
 
 val Module.shouldUseJpsOutput: Boolean
-    get() = !(isGradleModule() && GradleSystemRunningSettings.getInstance().isUseGradleAwareMake)
\ No newline at end of file
+    get() = !(isGradleModule() && GradleProjectSettings.isDelegatedBuildEnabled(this))
\ No newline at end of file