diff --git a/tutorial/Sgml.pmod b/tutorial/Sgml.pmod
index 6597189496a9f793fbaad97ab281c98ee0ef19dd..d510f4b685f97c4db57a1899d9665004cfba5b16 100644
--- a/tutorial/Sgml.pmod
+++ b/tutorial/Sgml.pmod
@@ -19,7 +19,7 @@ class Tag
   }
 
   void create(string t, void|mapping p, void|int po, 
-	      void|array(object) d, void|string f)
+	      void|array(object|string) d, void|string f)
   {
     tag=t;
     pos=po;
diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod
index ee25d737d16e85f5e96d54bedbdaf3dc09e11dc9..2da5186425ffa371265f17d11ad887e984c0d0ed 100644
--- a/tutorial/Wmml.pmod
+++ b/tutorial/Wmml.pmod
@@ -846,6 +846,7 @@ string mkgif(mixed o)
 object render_illustration(string pike_code, mapping params, float dpi)
 {
   werror("Rendering ");
+  if (params->__from__) werror("["+params->__from__+"] ");
   string src=params->src;
   object img=Image.image();
 
@@ -856,7 +857,7 @@ object render_illustration(string pike_code, mapping params, float dpi)
   if(params->src) 
      img=srccache[params->src]||
 	(srccache[params->src]=
-	 img->fromppm(Process.popen("anytopnm 2>/dev/null "+src)));
+	 Image.PNM.decode(Process.popen("anytopnm "+params->src)));
   if(scale!=1.0) img=img->scale(scale);
   return compile_string("import Image;\n"
 			"mixed `()(object src){ "+pike_code+" ; }")()(img);