diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
index 058c2b388f9..fa804740b33 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
@@ -89,7 +89,7 @@ obj
 //        assertThrows(NoSuchMethodException::class.java) {
 //            invocator!!.invokeMethod(res1, "fn", 3)
 //        }
-        val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
+        val res3 = invocator.invokeMethod(res1, "fn1", 3)
         Assert.assertEquals(6, res3)
     }
 
@@ -150,10 +150,10 @@ obj
         val times = generateSequence {
             val t0 = mxBeans.threadCpuTime()
 
-            val res1 = engine.eval(script)
+            engine.eval(script)
             val t1 = mxBeans.threadCpuTime()
 
-            val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
+            engine.eval("eval(\"\"\"$script\"\"\", bnd)")
             val t2 = mxBeans.threadCpuTime()
 
             Triple(t1 - t0, t2 - t1, t2 - t1)
diff --git a/libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt b/libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
index 99d9d838a53..9a24ada6ee3 100644
--- a/libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
+++ b/libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
@@ -134,7 +134,7 @@ obj
 //        assertThrows(NoSuchMethodException::class.java) {
 //            invocator!!.invokeMethod(res1, "fn", 3)
 //        }
-        val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
+        val res3 = invocator.invokeMethod(res1, "fn1", 3)
         Assert.assertEquals(6, res3)
     }
 
@@ -218,10 +218,10 @@ obj
         val times = generateSequence {
             val t0 = mxBeans.threadCpuTime()
 
-            val res1 = engine.eval(script)
+            engine.eval(script)
             val t1 = mxBeans.threadCpuTime()
 
-            val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
+            engine.eval("eval(\"\"\"$script\"\"\", bnd)")
             val t2 = mxBeans.threadCpuTime()
 
             Triple(t1 - t0, t2 - t1, t2 - t1)
diff --git a/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptConfigurationTools.kt b/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptConfigurationTools.kt
index 3b68b924539..f7ff55965f3 100644
--- a/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptConfigurationTools.kt
+++ b/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptConfigurationTools.kt
@@ -6,7 +6,6 @@
 package kotlin.script.experimental.intellij
 
 import com.intellij.openapi.extensions.ExtensionPointName
-import com.intellij.openapi.extensions.Extensions
 import com.intellij.psi.PsiFile
 
 /**
@@ -16,7 +15,7 @@ import com.intellij.psi.PsiFile
  * based on the reloaded definition should be reloaded automatically or using notification and explicit reload action
  */
 fun reloadScriptConfiguration(scriptFile: PsiFile, updateEditorWithoutNotification: Boolean = false) {
-    val extensions = Extensions.getArea(scriptFile.project).getExtensionPoint(IdeScriptConfigurationControlFacade.EP_NAME).extensions
+    val extensions = scriptFile.project.extensionArea.getExtensionPoint(IdeScriptConfigurationControlFacade.EP_NAME).extensions
     for (extension in extensions) {
         extension.reloadScriptConfiguration(scriptFile, updateEditorWithoutNotification)
     }
diff --git a/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptDefinitionProvider.kt b/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptDefinitionProvider.kt
index 1cd8466f763..df41c240b61 100644
--- a/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptDefinitionProvider.kt
+++ b/libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptDefinitionProvider.kt
@@ -48,6 +48,7 @@ interface ScriptDefinitionsProvider {
     /**
      * The callback to update/add/remove script definitions after loading, if needed
      */
+    @Suppress("DEPRECATION") // To be replaced with -Xjvm-default=all-compatibility.
     @JvmDefault
     fun provideDefinitions(
         baseHostConfiguration: ScriptingHostConfiguration,