diff --git a/scheme/httpd/info-gateway.scm b/scheme/httpd/info-gateway.scm
index 33baefd..e6d2531 100644
--- a/scheme/httpd/info-gateway.scm
+++ b/scheme/httpd/info-gateway.scm
@@ -265,7 +265,7 @@
   (define (maybe-display-header header icon alt)
     (if header
 	(begin
-	  (newline)
+	  (newline out)
 	  (with-tag out b ()
 	    (display-reference file header header icon alt)))))
 
@@ -340,7 +340,7 @@
 		  (begin
 		    (display-xref (cadr components) file display-reference out)
 		    (loop (cddr components))))))
-	(newline)))))
+	(newline out)))))
 
 ;; Menus
 
@@ -373,7 +373,7 @@
 	    (info-gateway-error  "invalid menu item")))
 	(emit-tag out 'dt)
 	(display-reference file node-name note (icon-name 'menu) "*")
-	(newline)
+	(newline out)
 	(if (and (not (string=? "" text))
 		 (not (string=? "." text)))
 	    (begin
@@ -426,9 +426,7 @@
 	  (loop)))))
 	    
 (define (display-node node-name find-file display-reference icon-name out)
-  (write (list 'node-name node-name)) (newline)
   (receive (file node) (parse-node-name node-name)
-    (write (list 'file file 'node node #\newline)) (newline)
     (receive (port file-header node-header up-header prev-header next-header)
 	(find-node file node find-file)