diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index a46a70a..870b2c5 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -80,8 +80,11 @@
     "manifest",
     "platform-main",
     "remote-servers-java-impl",
+    "structuralsearch",
+    "structuralsearch-java",
     "testFramework",
     "tests_bootstrap",
+    "typeMigration",
     "ui-designer-core"
   ].flatten()
   implementationModules.removeAll(jpsCommonModules) //todo[nik] remove jps modules from platformImplementationModules instead and update layouts of minor IDEs accordingly
@@ -256,7 +259,7 @@
   }
 
   dir("plugins") {
-    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github", "typeMigration"] //, "tasks-time-tracking"]
+    def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
 
     simplePlugins.each {
       layoutPlugin it
@@ -534,15 +537,6 @@
       }
     }
 
-    pluginDir("structuralsearch") {
-      dir("lib") {
-        jar("structuralsearch.jar") {
-          module("structuralsearch")
-          module("structuralsearch-java")
-        }
-      }
-    }
-
     pluginDir("java-decompiler") {
       dir("lib") {
         jar("java-decompiler.jar") {
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index e0cb06b..d64c75f 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -88,7 +88,7 @@
     this[key]
   }
   catch (MissingPropertyException ignored) {
-    projectBuilder.error("Property $key is required")
+    projectBuilder.error("Property '$key' is required")
   }
 }
 
@@ -97,7 +97,7 @@
     this[key]
   }
   catch (MissingPropertyException ignored) {
-    projectBuilder.info("$key is not defined. Defaulting to $defaultValue")
+    projectBuilder.info("'$key' is not defined. Defaulting to '$defaultValue'")
     this[key] = defaultValue
   }
 }
@@ -112,8 +112,9 @@
 })
 
 binding.setVariable("guessHome", {
-  // Current file is supposed to be at build/scripts/release.gant path
-  new File(requireProperty("gant.file").substring("file:".length())).getParentFile().getParentFile().getParent()
+  // current file is supposed to be at build/scripts/*.gant path
+  String uri = requireProperty("gant.file")
+  new File(new URI(uri).getSchemeSpecificPart()).getParentFile().getParentFile().getParent()
 })
 
 binding.setVariable("loadProject", {