diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h
index 6e883ef92..fb1207d56 100644
--- a/uppsrc/CodeEditor/CodeEditor.h
+++ b/uppsrc/CodeEditor/CodeEditor.h
@@ -381,7 +381,7 @@ public:
 
 	void   SerializeFind(Stream& s);
 	bool   IsFindOpen() const                       { return findreplace.IsOpen(); }
-	void   FindClose()                              { findreplace.Close(); }
+	void   FindClose()                              { CloseFindReplace(); }
 
 	void   Goto();
 
diff --git a/uppsrc/CodeEditor/FindReplace.cpp b/uppsrc/CodeEditor/FindReplace.cpp
index e6097c3d0..4c3e696df 100644
--- a/uppsrc/CodeEditor/FindReplace.cpp
+++ b/uppsrc/CodeEditor/FindReplace.cpp
@@ -503,10 +503,13 @@ void CodeEditor::Replace()
 	NextUndo();
 	FindReplaceAddHistory();
 	if(!found) return;
+	bool h = persistent_find_replace;
+	persistent_find_replace = true; // avoid closing of findreplace by selection change
 	if(RemoveSelection()) {
 		Paste(GetReplaceText());
 		Find(false, false, true);
 	}
+	persistent_find_replace = h;
 }
 
 int CodeEditor::BlockReplace()
diff --git a/uppsrc/ide/Build.cpp b/uppsrc/ide/Build.cpp
index 04428c074..a0819437b 100644
--- a/uppsrc/ide/Build.cpp
+++ b/uppsrc/ide/Build.cpp
@@ -82,6 +82,7 @@ void Ide::DoBuild()
 
 void Ide::PackageBuild()
 {
+	InitBlitz();
 	BeginBuilding(true, true);
 	const Workspace& wspc = IdeWorkspace();
 	int pi = GetPackageIndex();
diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp
index e2ca1b309..400fbcef6 100644
--- a/uppsrc/ide/Builders/Build.cpp
+++ b/uppsrc/ide/Builders/Build.cpp
@@ -127,7 +127,6 @@ One<Host> MakeBuild::CreateHost(bool sync_files)
 One<Builder> MakeBuild::CreateBuilder(Host *host)
 {
 	SetupDefaultMethod();
-	InitBlitz();
 	VectorMap<String, String> bm = GetMethodVars(method);
 	String builder = bm.Get("BUILDER", "GCC");
 	int q = BuilderMap().Find(builder);
@@ -441,6 +440,8 @@ Vector<String> MakeBuild::GetAllLibraries(const Workspace& wspc, int index,
 
 bool MakeBuild::Build(const Workspace& wspc, String mainparam, String outfile, bool clear_console)
 {
+	InitBlitz();
+
 	String hfile = outfile + ".xxx";
 	SaveFile(hfile, "");
 	start_time = GetFileTime(hfile); // Defensive way to get correct filetime of start
@@ -530,7 +531,7 @@ bool MakeBuild::Build(const Workspace& wspc, String mainparam, String outfile, b
 			// changes during compilation, it is recompiled during next build
 			SetFileTime(target, start_time);
 			for(int i = 0; i < immfile.GetCount(); i++)
-				SetFileTime(immfile[i], start_time); 
+				SetFileTime(immfile[i], start_time);
 		}
 	}
 	EndBuilding(ok);
diff --git a/uppsrc/ide/Builders/Builders.upp b/uppsrc/ide/Builders/Builders.upp
index 4ef41e658..1a5660274 100644
--- a/uppsrc/ide/Builders/Builders.upp
+++ b/uppsrc/ide/Builders/Builders.upp
@@ -5,15 +5,16 @@ noblitz;
 uses
 	ide\Core,
 	ide/Android,
-	ide/Java;
+	ide/Java,
+	ide/Android;
 
 file
 	Builders.h options(BUILDER_OPTION) PCH,
 	CppBuilder.cpp,
 	MakeFile.cpp,
-	GccBuilder.icpp,
 	coff.h,
 	Builders readonly separator,
+	GccBuilder.icpp,
 	MscBuilder.icpp,
 	OwcBuilder.icpp,
 	JavaBuilder.icpp,
diff --git a/uppsrc/plugin/pcre/init b/uppsrc/plugin/pcre/init
index 45ebd60be..48f81a81f 100644
--- a/uppsrc/plugin/pcre/init
+++ b/uppsrc/plugin/pcre/init
@@ -1,3 +1,4 @@
 #ifndef _plugin_pcre_icpp_init_stub
 #define _plugin_pcre_icpp_init_stub
+#include "Core/init"
 #endif
diff --git a/uppsrc/plugin/pcre/pcre.upp b/uppsrc/plugin/pcre/pcre.upp
index b072295da..8a99b3d59 100644
--- a/uppsrc/plugin/pcre/pcre.upp
+++ b/uppsrc/plugin/pcre/pcre.upp
@@ -4,6 +4,9 @@ noblitz;
 
 options(BUILDER_OPTION) NOWARNINGS;
 
+uses
+	Core;
+
 file
 	Pcre.h,
 	RegExp.h,