diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
index 5b4a74c24..333dc5009 100644
--- a/uppsrc/CtrlCore/CtrlCore.upp
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -35,7 +35,7 @@ library(DRAGONFLY) "Xext Xinerama";
 
 file
 	Core readonly separator,
-	CtrlCore.h options PCH,
+	CtrlCore.h options(BUILDER_OPTION) PCH,
 	MKeys.h,
 	stdids.h,
 	SystemDraw.cpp,
diff --git a/uppsrc/CtrlCore/GtkDrawImage.cpp b/uppsrc/CtrlCore/GtkDrawImage.cpp
index 28ea573da..2f91da4ec 100644
--- a/uppsrc/CtrlCore/GtkDrawImage.cpp
+++ b/uppsrc/CtrlCore/GtkDrawImage.cpp
@@ -138,6 +138,10 @@ void CairoGet(ImageBuffer& b, Size isz, cairo_surface_t *surface, cairo_surface_
 
 void ImageDraw::FetchStraight(ImageBuffer& b) const
 {
+	ImageDraw *m = const_cast<ImageDraw *>(this);
+	m->FlushText();
+	if(alpha_surface)
+		m->alpha.FlushText();
 	CairoGet(b, isz, surface, alpha_surface);
 }
 
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
index aa63470cf..27c33a181 100644
--- a/uppsrc/CtrlCore/init
+++ b/uppsrc/CtrlCore/init
@@ -3,7 +3,7 @@
 #include "Draw/init"
 #include "plugin\bmp/init"
 #include "RichText/init"
-#define BLITZ_INDEX__ F656a4ea94e4f808b1ec63034b0e6c5ac
+#define BLITZ_INDEX__ Fe2ff541f9bb9f4ad3f5bcc23a34e1b73
 #include "CtrlCore.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/IconDes/IconDes.upp b/uppsrc/IconDes/IconDes.upp
index 0920f0886..bbb887bc6 100644
--- a/uppsrc/IconDes/IconDes.upp
+++ b/uppsrc/IconDes/IconDes.upp
@@ -8,7 +8,7 @@ uses
 	RichEdit;
 
 file
-	IconDes.h options PCH,
+	IconDes.h options(BUILDER_OPTION) PCH,
 	IconDes.key,
 	IconDraw.cpp,
 	AlphaCtrl.cpp,
diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp
index 81f43f59e..a64f29e08 100644
--- a/uppsrc/ide/ide.upp
+++ b/uppsrc/ide/ide.upp
@@ -25,7 +25,7 @@ link(WIN32 MSC) /MAP;
 
 file
 	IDE readonly separator,
-	ide.h options PCH,
+	ide.h options(BUILDER_OPTION) PCH,
 	version.h,
 	UppDlg.h,
 	BaseDlg.cpp,