diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
index e28cc215c..3477e608f 100644
--- a/uppsrc/Core/Diag.h
+++ b/uppsrc/Core/Diag.h
@@ -246,4 +246,4 @@ void DumpMap(Stream& s, const T& t) {
 	s << LOG_END;
 }
 
-String AsString(MemoryProfile& mem);
+String AsString(const MemoryProfile& mem);
diff --git a/uppsrc/Core/Log.cpp b/uppsrc/Core/Log.cpp
index 790357461..5a6c5a053 100644
--- a/uppsrc/Core/Log.cpp
+++ b/uppsrc/Core/Log.cpp
@@ -269,7 +269,7 @@ static void sLarge(String& text, size_t *large, int count, const char *txt)
 	}
 }
 
-String AsString(MemoryProfile& mem)
+String AsString(const MemoryProfile& mem)
 {
 	String text;
 	int acount = 0;
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 64884df07..7a77e51dd 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1397,7 +1397,7 @@ public:
 };
 
 void DrawDragRect(Ctrl& q, const Rect& rect1, const Rect& rect2, const Rect& clip, int n,
-                  Color color, const word *pattern);
+                  Color color, uint64 pattern);
 
 bool PointLoop(Ctrl& ctrl, const Vector<Image>& ani, int ani_ms);
 bool PointLoop(Ctrl& ctrl, const Image& img);
diff --git a/uppsrc/CtrlLib/Button.cpp b/uppsrc/CtrlLib/Button.cpp
index 416a03d77..787065705 100644
--- a/uppsrc/CtrlLib/Button.cpp
+++ b/uppsrc/CtrlLib/Button.cpp
@@ -144,7 +144,7 @@ Pusher& Pusher::ClickFocus(bool cf)
 	return *this;
 }
 
-String Pusher::GetDesc()
+String Pusher::GetDesc() const
 {
 	return label;
 }
diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp
index d0a12eec4..d5988399a 100644
--- a/uppsrc/CtrlLib/CtrlUtil.cpp
+++ b/uppsrc/CtrlLib/CtrlUtil.cpp
@@ -207,7 +207,7 @@ void Get(ArrayCtrl& array, int ii, IdCtrls& m)
 		m[i] <<= array.Get(ii, m(i));
 }
 
-String sProfile(MemoryProfile& mem)
+String sProfile(const MemoryProfile& mem)
 {
 	return AsString(mem);
 }
@@ -217,7 +217,7 @@ void MemoryProfileInfo() {
 	String text = sProfile(mem);
 	const MemoryProfile *peak = PeakMemoryProfile();
 	if(peak)
-		text << "\r\n=== Peak memory profile\r\n" << sProfile(mem);
+		text << "\r\n=== Peak memory profile\r\n" << sProfile(*peak);
 	PromptOK("[C " + DeQtfLf(text));
 };
 
diff --git a/uppsrc/CtrlLib/PushCtrl.h b/uppsrc/CtrlLib/PushCtrl.h
index 8094dcd80..3a7ac2ff5 100644
--- a/uppsrc/CtrlLib/PushCtrl.h
+++ b/uppsrc/CtrlLib/PushCtrl.h
@@ -9,7 +9,7 @@ public:
 	virtual void   GotFocus();
 	virtual void   LostFocus();
 	virtual void   State(int);
-	virtual String GetDesc();
+	virtual String GetDesc() const;
 	virtual bool   Key(dword key, int);
 	virtual bool   HotKey(dword key);
 	virtual dword  GetAccessKeys() const;
diff --git a/uppsrc/Painter/Fillers.cpp b/uppsrc/Painter/Fillers.cpp
index e7eb15c58..77cc22386 100644
--- a/uppsrc/Painter/Fillers.cpp
+++ b/uppsrc/Painter/Fillers.cpp
@@ -43,7 +43,7 @@ inline RGBA InvertRGBA(const RGBA& c)
 	a.r = ~c.r;
 	a.g = ~c.g;
 	a.b = ~c.b;
-	a.a = c.a;
+	a.a = 255;
 	return a;
 }
 
@@ -72,7 +72,7 @@ void SolidFiller::Render(int val, int len)
 			}
 		else
 			while(t < e) {
-				AlphaBlend(*t, Mul8(InvertRGBA(*t), val));
+				AlphaBlendCover8(*t, InvertRGBA(*t), val);
 				t++;
 			}
 	}
@@ -411,6 +411,7 @@ void ClipFiller::Finish(ClippingLine& cl)
 		x += n;
 		full = false;
 	}
+	ASSERT(t - ~buffer <= 2 * cx);
 	if(full)
 		cl.SetFull();
 	else
diff --git a/uppsrc/RichEdit/Mouse.cpp b/uppsrc/RichEdit/Mouse.cpp
index ec2861078..82c21e108 100644
--- a/uppsrc/RichEdit/Mouse.cpp
+++ b/uppsrc/RichEdit/Mouse.cpp
@@ -79,7 +79,7 @@ void RichEdit::LeftDown(Point p, dword flags)
 		int tx, ty;
 		switch(c) {
 		case 1:
-			tracker.SetCursorImage(Image::SizeHorz());
+			tracker.SetCursorImage(Image::SizeVert());
 			tx = ALIGN_CENTER; ty = ALIGN_BOTTOM;
 			break;
 		case 2:
diff --git a/uppsrc/RichEdit/RichEdit.t b/uppsrc/RichEdit/RichEdit.t
index faa1da61d..ef10c89dd 100644
--- a/uppsrc/RichEdit/RichEdit.t
+++ b/uppsrc/RichEdit/RichEdit.t
@@ -2173,7 +2173,7 @@ zhTW("Allow orphans")
 
 T_("Ruler")
 caES("Regle")
-csCZ("Prav\303\255tko")
+csCZ("\304\214\303\241ra p\305\231ed")
 deDE("")
 esES("Regla")
 fiFI("")
@@ -2192,7 +2192,7 @@ zhTW("\351\207\217\345\260\272")
 
 T_("Ruler height")
 caES("Al\303\247ada de regla")
-csCZ("V\303\275\305\241ka prav\303\255tka")
+csCZ("V\303\275\305\241ka \304\215\303\241ry")
 deDE("")
 esES("Altura de regla")
 fiFI("")
@@ -2212,7 +2212,7 @@ zhTW("\351\207\217\345\260\272\351\253\230\345\272\246")
 
 T_("Ink")
 caES("Tinta")
-csCZ("Text")
+csCZ("Barva")
 deDE("Textfarbe")
 esES("Tinta")
 fiFI("Muste")