diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index 04f369d51..73e0b33ce 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -64,6 +64,7 @@ Image GetFileIcon(const char *path, bool dir, bool force, bool large)
 		m.file = "x." + ext;
 	return MakeImage(m);
 }
+
 #endif
 
 #ifdef PLATFORM_X11
diff --git a/uppsrc/Draw/Draw.h b/uppsrc/Draw/Draw.h
index 224898ea4..95a4acf61 100644
--- a/uppsrc/Draw/Draw.h
+++ b/uppsrc/Draw/Draw.h
@@ -942,16 +942,8 @@ public:
 #endif
 
 private: //Deprecated
-	FontInfo GetFontInfo(byte charset, Font font = StdFont());
-	FontInfo GetFontInfo(Font font = StdFont());
 	FontInfo GetFontInfoW(Font font = StdFont());
 
-	Size GetTextSize(const wchar *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
-	Size GetTextSize(const WString& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
-	Size GetTextSize(const char *text, byte charset, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, charset, font); }
-	Size GetTextSize(const char *text, Font font = StdFont(), int n = -1) { return UPP::GetTextSize(text, font, n); }
-	Size GetTextSize(const String& text, Font font = StdFont()) { return UPP::GetTextSize(text, font); }
-
 private:
 	Draw(const Draw&);
 	void operator=(const Draw&);
diff --git a/uppsrc/Draw/DrawText.cpp b/uppsrc/Draw/DrawText.cpp
index f60351ca9..2728f103e 100644
--- a/uppsrc/Draw/DrawText.cpp
+++ b/uppsrc/Draw/DrawText.cpp
@@ -294,11 +294,11 @@ void FontInfo::Retain(const FontInfo& f)
 	charset = f.charset;
 }
 
-FontInfo Draw::GetFontInfo(byte charset, Font font) {
+
+FontInfo Draw::GetFontInfoW(Font font) {
 	DrawLock __;
 	LTIMING("GetFontInfo");
-	if(charset == CHARSET_DEFAULT)
-		charset = GetDefaultCharset();
+	byte charset = CHARSET_UNICODE;
 	if(lastFont.IsEqual(charset, font, 0, device))
 		return lastFont;
 #ifdef PLATFORM_WIN32
@@ -312,16 +312,6 @@ FontInfo Draw::GetFontInfo(byte charset, Font font) {
 	return fi;
 }
 
-FontInfo Draw::GetFontInfo(Font font)
-{
-	return GetFontInfo(CHARSET_DEFAULT, font);
-}
-
-FontInfo Draw::GetFontInfoW(Font font)
-{
-	return GetFontInfo(CHARSET_UNICODE, font);
-}
-
 void Draw::SetFont(Font font, int angle) {
 	DrawLock __;
 	LLOG("Set font: " << font << " face: " << font.GetFaceName());
diff --git a/uppsrc/TDraw/util.cpp b/uppsrc/TDraw/util.cpp
index 6d60b7f8a..cc62b9e78 100644
--- a/uppsrc/TDraw/util.cpp
+++ b/uppsrc/TDraw/util.cpp
@@ -751,12 +751,12 @@ void DrawPolyPolyPolygon(Draw& draw, const Point *vertices, int vertex_count,
 //		TIMING("DrawPolyPolygon/stream");
 		Vector<Point> out_vertices;
 		Vector<int> out_subpolygon_counts, out_polygon_counts;
-		StreamPolyPolyPolygon(draw.DrawingOp(wPolyPolyPolygon),
+/*		StreamPolyPolyPolygon(draw.DrawingOp(wPolyPolyPolygon),
 			out_vertices, vertices, vertex_count,
 			out_subpolygon_counts, subpolygon_counts, subpolygon_count_count,
 			out_polygon_counts, disjunct_polygon_counts, disjunct_polygon_count_count,
 			color, width, outline, pattern, doxor);
-		return;
+*/		return;
 	}
 //	TIMING("DrawPolyPolygon/hdc");
 	bool is_xor = !IsNull(doxor);
diff --git a/uppsrc/ide/Debuggers/Code.cpp b/uppsrc/ide/Debuggers/Code.cpp
index 331ed9f64..5c3d3354c 100644
--- a/uppsrc/ide/Debuggers/Code.cpp
+++ b/uppsrc/ide/Debuggers/Code.cpp
@@ -48,13 +48,13 @@ void Pdb::Sync0()
 {
 	stop = false;
 	const CONTEXT& context = threads.Get((int)~threadlist).context;
-	#ifdef CPU_32
+#ifdef CPU_32
 	adr_t eip = context.Eip;
 	adr_t ebp = context.Ebp;
-	#else
+#else
 	adr_t eip = context.Rip;
 	adr_t ebp = context.Rbp;
-	#endif
+#endif
 	adr_t spmax = threads.Get(event.dwThreadId).sp;
 	framelist.Clear();
 	frame.Clear();
diff --git a/uppsrc/ide/Debuggers/Visualise.cpp b/uppsrc/ide/Debuggers/Visualise.cpp
index 3df569d7a..06b11a2cc 100644
--- a/uppsrc/ide/Debuggers/Visualise.cpp
+++ b/uppsrc/ide/Debuggers/Visualise.cpp
@@ -233,8 +233,8 @@ Pdb::Visual Pdb::Visualise(const String& exp)
 	return r;
 }
 
-void Pdb::VisualDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style)
-const
+void Pdb::VisualDisplay::Paint(Draw& w, const Rect& r, const Value& q,
+                               Color ink, Color paper, dword style) const
 {
 	int x = r.left;
 	int y = r.top + (r.Height() - Draw::GetStdFontCy()) / 2;
diff --git a/uppsrc/plugin/jpg/jpgupp.cpp b/uppsrc/plugin/jpg/jpgupp.cpp
index 2af41bceb..7cfb50d5d 100644
--- a/uppsrc/plugin/jpg/jpgupp.cpp
+++ b/uppsrc/plugin/jpg/jpgupp.cpp
@@ -671,7 +671,8 @@ void JPGEncoder::WriteLineRaw(const byte *s)
 Image JPGRaster::GetExifThumbnail()
 {
 	ASSERT(data);
-	return StreamRaster::LoadStringAny(data->GetThumbnail());
+	StringStream ss(data->GetThumbnail());
+	return StreamRaster::LoadStringAny(ss);
 }
 
 END_UPP_NAMESPACE
diff --git a/uppsrc/plugin/pcx/init b/uppsrc/plugin/pcx/init
index 2e8ecac30..fdfe0c8d5 100644
--- a/uppsrc/plugin/pcx/init
+++ b/uppsrc/plugin/pcx/init
@@ -1,4 +1,6 @@
 #ifndef _plugin_pcx_icpp_init_stub
 #define _plugin_pcx_icpp_init_stub
+#define BLITZ_INDEX__ F7436A22E881D6898946270473975CEA8
 #include "pcxreg.icpp"
+#undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/plugin/pcx/pcx.upp b/uppsrc/plugin/pcx/pcx.upp
index 88df9f9a9..a87281af1 100644
--- a/uppsrc/plugin/pcx/pcx.upp
+++ b/uppsrc/plugin/pcx/pcx.upp
@@ -1,3 +1,5 @@
+description "\3770,128,128";
+
 file
 	pcx.h,
 	pcxhdr.h,
diff --git a/uppsrc/plugin/tif/tifupp.cpp b/uppsrc/plugin/tif/tifupp.cpp
index 5b0bddc81..071818044 100644
--- a/uppsrc/plugin/tif/tifupp.cpp
+++ b/uppsrc/plugin/tif/tifupp.cpp
@@ -342,7 +342,8 @@ static void BltPack4(byte *dest, const byte *src, unsigned count)
 static tsize_t ReadStream(thandle_t fd, tdata_t buf, tsize_t size)
 {
 	Stream *stream = reinterpret_cast<Stream *>(fd);
-	ASSERT(stream->IsOpen());
+	if(!stream->IsOpen())
+		return 0;
 //	RLOG("TiffStream::TIFRaster::Data & " << (int)wrapper.stream.GetPos() << ", count = " << size
 //		<< ", end = " << (int)(wrapper.stream.GetPos() + size));
 	return stream->Get(buf, size);