diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt
index 0c656883c87..0f450cc5c54 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt
@@ -154,10 +154,10 @@ private fun CompiledScript<*>.makeClassLoaderFromDependencies(baseClassLoader: C
                 (dep as? JvmDependency)?.classpath?.asSequence()?.map { it.toURI().toURL() } ?: emptySequence()
             }
             ?: emptySequence()
-    }.distinct()
+    }.distinct().toList()
     // TODO: previous dependencies and classloaders should be taken into account here
-    return if (dependencies.none()) baseClassLoader
-    else URLClassLoader(dependencies.toList().toTypedArray(), baseClassLoader)
+    return if (dependencies.isEmpty()) baseClassLoader
+    else URLClassLoader(dependencies.toTypedArray(), baseClassLoader)
 }
 
 const val KOTLIN_SCRIPT_METADATA_PATH = "META-INF/kotlin/script"
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
index f5abd90936c..8fb01f3340d 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
@@ -89,7 +89,7 @@ internal fun getScriptKtFile(
     val scriptText = getMergedScriptText(script, scriptCompilationConfiguration)
     val virtualFile = ScriptLightVirtualFile(
         script.scriptFileName(script, scriptCompilationConfiguration),
-        (script as? FileBasedScriptSource)?.file?.path,
+        (script as? FileBasedScriptSource)?.file?.path, // TODO: should be absolute path here
         scriptText
     )
     val ktFile = psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile?