diff --git a/autotest/Zlib/Zlib.cpp b/autotest/Zlib/Zlib.cpp
index 1ec0230b0..b48a4f8a0 100644
--- a/autotest/Zlib/Zlib.cpp
+++ b/autotest/Zlib/Zlib.cpp
@@ -10,7 +10,7 @@ String RandomString(int len)
 			r.Cat("\r\n");
 		else
 			r.Cat(Random(64) + 32);
-	return r;
+	return String(r);
 }
 
 void Check(const String& data)
diff --git a/examples/GeoFun/GeoFun.cpp b/examples/GeoFun/GeoFun.cpp
index 7a172e6a4..a21cb17a7 100644
--- a/examples/GeoFun/GeoFun.cpp
+++ b/examples/GeoFun/GeoFun.cpp
@@ -134,7 +134,7 @@ Image GeoFun::GetImage()
 	BufferPainter bp(ib, MODE_ANTIALIASED);
 	dc1.DoPaint0(bp, 1);
 
-	return ib;
+	return Image(ib);
 }
 
 void GeoFun::SaveToImageFile(String fileName)
diff --git a/tutorial/Image06/main.cpp b/tutorial/Image06/main.cpp
index 5e7446b4d..a97b30ba6 100644
--- a/tutorial/Image06/main.cpp
+++ b/tutorial/Image06/main.cpp
@@ -16,7 +16,7 @@ Image CreateBall(int r, Color color)
 			int q = ((x - r) * (x - r) + (y - r) * (y - r)) * 256 / r2;
 			a.a = q <= 255 ? q : 0;
 		}
-	return b;
+	return Image(b);
 }
 
 struct BallMaker : ImageMaker {
diff --git a/uppsrc/Docking/DockableCtrl.cpp b/uppsrc/Docking/DockableCtrl.cpp
index b7d67986a..f55ef9000 100644
--- a/uppsrc/Docking/DockableCtrl.cpp
+++ b/uppsrc/Docking/DockableCtrl.cpp
@@ -124,7 +124,7 @@ void DockableCtrlImgsLook(Value* look, int i, int n)
 Image ChCrop(const Value& element, Size canvas, Rect crop, Color baseline)
 {
 	ImageDraw draw(canvas);
-	ChPaint(draw, canvas, element);	
+	ChPaint(draw, canvas, element);
 	if (!IsNull(baseline)) {
 		draw.DrawLine(0, canvas.cy-1, canvas.cx+1, canvas.cy, 1, baseline);
 	}
@@ -141,7 +141,7 @@ Image StandardHighlight(Color inside, Color border)
 			*(q++) = (i == 4 || j == 4 || !i || !j) ? border : inside;
 	ib.SetHotSpot(Point(1, 1));
 	ib.Set2ndSpot(Point(3, 3));
-	return ib;
+	return Image(ib);
 }
 
 Image AlphaHighlight(const Image& img, int alpha)
@@ -154,7 +154,7 @@ Image AlphaHighlight(const Image& img, int alpha)
 	ImageBuffer ib(temp);
 	ib.SetHotSpot(Point(1, 1));
 	ib.Set2ndSpot(Point(3, 3));
-	return ib;
+	return Image(ib);
 }
 
 CH_STYLE(DockableCtrl, Style, StyleDefault)
diff --git a/uppsrc/Draw/srcdoc.tpp/ImgTutorial_en-us.tpp b/uppsrc/Draw/srcdoc.tpp/ImgTutorial_en-us.tpp
index a7332d944..9e82a0f6c 100644
--- a/uppsrc/Draw/srcdoc.tpp/ImgTutorial_en-us.tpp
+++ b/uppsrc/Draw/srcdoc.tpp/ImgTutorial_en-us.tpp
@@ -539,7 +539,7 @@ r) ][C@(0.0.255)+75 `+][C+75  (y ][C@(0.0.255)+75 `-][C+75  r) ][C@(0.0.255)+75
 q ][C@(0.0.255)+75 <`=][C+75  ][C@3+75 255][C+75  ][C@(0.0.255)+75 ?][C+75  
 q ][C@(0.0.255)+75 :][C+75  ][C@3+75 0][C+75 ;]&]
 [s0;l320;%- [C+75         `}]&]
-[s0;l320;%- [C+75     ][*_C@(128.0.255)+75 return][C+75  b;]&]
+[s0;l320;%- [C+75     ][*_C@(128.0.255)+75 return][C+75  Image(b);]&]
 [s0;l320;%- [C+75 `}]&]
 [s0;l320;C+75%- &]
 [s0;l320;%- [*C@(0.0.255)+75 struct][C+75  BallMaker ][C@(0.0.255)+75 :][C+75  
diff --git a/uppsrc/RasterPlayer/RasterPlayer.cpp b/uppsrc/RasterPlayer/RasterPlayer.cpp
index a26c741fc..216c47e89 100644
--- a/uppsrc/RasterPlayer/RasterPlayer.cpp
+++ b/uppsrc/RasterPlayer/RasterPlayer.cpp
@@ -17,7 +17,7 @@ Image GetRect_(const Image& orig, const Rect &r) {
 			s++;
 		}
 	}
-	return ib;
+	return Image(ib);
 }
 
 Rect Fit(const Size &frame, const Size &object) {