diff --git a/uppbox/uppweb/www.cpp b/uppbox/uppweb/www.cpp
index 5256f2203..7707473a6 100644
--- a/uppbox/uppweb/www.cpp
+++ b/uppbox/uppweb/www.cpp
@@ -116,6 +116,7 @@ String GetImageSrc(ImageFn img)
 		q = il.GetCount();
 		il.Add(img);
 		PNGEncoder png;
+		(*img)();
 		png.SaveFile(AppendFileName(targetdir, ImgName(q)),(*img)());
 	}
 	return ImgName(q);
diff --git a/uppsrc/Draw/Uhd.cpp b/uppsrc/Draw/Uhd.cpp
index 725f2e424..5c0ffdb75 100644
--- a/uppsrc/Draw/Uhd.cpp
+++ b/uppsrc/Draw/Uhd.cpp
@@ -158,9 +158,9 @@ Image Downscale6x(const Image& src)
 	return Image(h);
 }
 
-int    DPIScaleGlobal_;
-double DPIScaleGlobalF_;
-double IDPIScaleGlobalF_;
+int    DPIScaleGlobal_ = 2;
+double DPIScaleGlobalF_ = 1;
+double IDPIScaleGlobalF_ = 1;
 
 void SetDPIScale(int scale)
 {
diff --git a/uppsrc/Draw/iml_header.h b/uppsrc/Draw/iml_header.h
index 874641cb9..c9e69d035 100644
--- a/uppsrc/Draw/iml_header.h
+++ b/uppsrc/Draw/iml_header.h
@@ -1,5 +1,9 @@
 //#BLITZ_APPROVE
 
+#ifdef VERSION
+#undef VERSION
+#endif
+
 #define IMAGE_META(k, v)
 #define IMAGE_VERSION(v)
 #define IMAGE_SCAN(s)
diff --git a/uppsrc/Draw/iml_source.h b/uppsrc/Draw/iml_source.h
index 848a273f7..54c0e6838 100644
--- a/uppsrc/Draw/iml_source.h
+++ b/uppsrc/Draw/iml_source.h
@@ -1,5 +1,9 @@
 //#BLITZ_APPROVE
 
+#ifdef VERSION
+#undef VERSION
+#endif
+
 #define VERSION(v)
 #define PREMULTIPLIED