diff --git a/lib/modules/Protocols.pmod/SMTP.pmod b/lib/modules/Protocols.pmod/SMTP.pmod
index c2324b7aa4537ee4713c30f46748710629c0bbde..5ceac240028632982c5b47856302bf7c157850b6 100644
--- a/lib/modules/Protocols.pmod/SMTP.pmod
+++ b/lib/modules/Protocols.pmod/SMTP.pmod
@@ -87,7 +87,7 @@ class client
 
   static string parse_addr(string addr)
   {
-    array(string|int) tokens = replace(MIME.tokenize(to), '@', "@");
+    array(string|int) tokens = replace(MIME.tokenize(addr), '@', "@");
 
     int i;
     tokens = tokens[search(tokens, '<') + 1..];
diff --git a/tutorial/Makefile b/tutorial/Makefile
index 864e7d871d0b53a34293f183e037511e5209ccac..2c1041af7f896cbb49fa06baa85b591c5ccfe199 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -60,7 +60,7 @@ tutorial.dvi: tutorial.tex
 	latex tutorial.tex
 
 tutorial.ps: tutorial.dvi
-	dvips -Z tutorial.dvi
+	dvips -Z tutorial.dvi -o tutorial.ps
 
 tutorial.ps.gz: tutorial.ps
 	gzip -9 <tutorial.ps >tutorial.ps.gz