diff --git a/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java b/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java
index 4383e20e0a4e..691268a48799 100644
--- a/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java
+++ b/platform/bootstrap/src/com/intellij/ide/startup/StartupActionScriptManager.java
@@ -38,8 +38,8 @@ public class StartupActionScriptManager {
     }
   }
 
-  public static synchronized void executeActionScript(@NotNull Path scriptFile, @NotNull Path oldTarget, @NotNull File newTarget) throws IOException {
-    List<ActionCommand> commands = loadActionScript(scriptFile);
+  public static synchronized void executeActionScript(@NotNull File scriptFile, @NotNull File oldTarget, @NotNull File newTarget) throws IOException {
+    List<ActionCommand> commands = loadActionScript(scriptFile.toPath());
     for (ActionCommand command : commands) {
       ActionCommand toExecute = mapPaths(command, oldTarget, newTarget);
       if (toExecute != null) {
@@ -89,11 +89,11 @@ public class StartupActionScriptManager {
       if (data instanceof ActionCommand[]) {
         return new ArrayList<>(Arrays.asList((ActionCommand[])data));
       }
-      else if (data instanceof List && ((List)data).size() == 0) {
+      else if (data instanceof List && ((List<?>)data).size() == 0) {
         return new ArrayList<>();
       }
       else {
-        throw new IOException("Unexpected object: " + data + "/" + data.getClass());
+        throw new IOException("An unexpected object: " + data + "/" + data.getClass());
       }
     }
     catch (ReflectiveOperationException e) {
@@ -114,7 +114,7 @@ public class StartupActionScriptManager {
     }
   }
 
-  private static ActionCommand mapPaths(ActionCommand command, Path oldTarget, File newTarget) {
+  private static ActionCommand mapPaths(ActionCommand command, File oldTarget, File newTarget) {
     if (command instanceof CopyCommand) {
       File destination = mapPath(((CopyCommand)command).myDestination, oldTarget, newTarget);
       if (destination != null) {
@@ -137,8 +137,8 @@ public class StartupActionScriptManager {
     return null;
   }
 
-  private static File mapPath(String path, Path oldTarget, File newTarget) {
-    String oldTargetPath = oldTarget.toString();
+  private static File mapPath(String path, File oldTarget, File newTarget) {
+    String oldTargetPath = oldTarget.getPath();
     if (path.startsWith(oldTargetPath)) {
       if (path.length() == oldTargetPath.length()) {
         return newTarget;
@@ -177,7 +177,7 @@ public class StartupActionScriptManager {
 
       File destDir = destination.getParentFile();
       if (!(destDir.isDirectory() || destDir.mkdirs())) {
-        throw new IOException("Cannot create directory: " + destDir);
+        throw new IOException("Cannot create a directory: " + destDir);
       }
 
       FileUtilRt.copy(source, destination);
@@ -215,7 +215,7 @@ public class StartupActionScriptManager {
       }
 
       if (!(destination.isDirectory() || destination.mkdirs())) {
-        throw new IOException("Cannot create directory: " + destination);
+        throw new IOException("Cannot create a directory: " + destination);
       }
 
       ZipUtil.extract(source, destination, myFilenameFilter);
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java
index d518249940fd..d2bb04406a96 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginInstaller.java
@@ -119,8 +119,7 @@ public class PluginInstaller {
       commands.add(new StartupActionScriptManager.CopyCommand(sourceFile, new File(pluginsPath, sourceFile.getName())));
     }
     else {
-      commands
-        .add(new StartupActionScriptManager.DeleteCommand(new File(pluginsPath, rootEntryName(sourceFile))));  // drops stale directory
+      commands.add(new StartupActionScriptManager.DeleteCommand(new File(pluginsPath, rootEntryName(sourceFile))));  // drops stale directory
       commands.add(new StartupActionScriptManager.UnzipCommand(sourceFile, new File(pluginsPath)));
     }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index 42eddb3167f9..749f1eec3cf1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -412,7 +412,7 @@ public final class ConfigImportHelper {
         Path script = oldSystemDir.resolve(PLUGINS + '/' + StartupActionScriptManager.ACTION_SCRIPT_FILE);  // PathManager#getPluginTempPath
         if (Files.isRegularFile(script)) {
           File newPluginsDir = new File(PathManager.getPluginsPath());
-          StartupActionScriptManager.executeActionScript(script, oldPluginsDir, newPluginsDir);
+          StartupActionScriptManager.executeActionScript(script.toFile(), oldPluginsDir.toFile(), newPluginsDir);
         }
       }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/updates/StartupActionScriptManagerTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/updates/StartupActionScriptManagerTest.kt
index b991f9ae5095..01c39921d278 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/updates/StartupActionScriptManagerTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ide/updates/StartupActionScriptManagerTest.kt
@@ -99,7 +99,7 @@ class StartupActionScriptManagerTest : BareTestFixtureTestCase() {
       StartupActionScriptManager.CopyCommand(copySource, copyDestinationInOld),
       StartupActionScriptManager.UnzipCommand(unzipSource, oldTarget),
       StartupActionScriptManager.DeleteCommand(deleteInOld)))
-    StartupActionScriptManager.executeActionScript(scriptFile, oldTarget.toPath(), newTarget)
+    StartupActionScriptManager.executeActionScript(scriptFile.toFile(), oldTarget, newTarget)
 
     assertFalse(copyDestinationInOld.exists())
     assertTrue(copyDestinationInNew.exists())