diff --git a/network-query.rkt b/network-query.rkt
index 8d1aaeb..f8222e4 100644
--- a/network-query.rkt
+++ b/network-query.rkt
@@ -216,7 +216,8 @@
     (subscribe subscription-id
       (message-handlers w
 	[(timer-expired (== subscription-id) _)
-	 (write `(Timed out ,q to ,zone-origin ,server-ip after ,timeout seconds)) (newline)
+	 (begin (write `(Timed out ,q ,query-id to ,zone-origin ,server-ip after ,timeout seconds))
+		(newline))
 	 (extend-transition (try-next-server w)
 	   (unsubscribe subscription-id)
 	   (send-message (list 'release-query-id query-id)))]
diff --git a/os-dns.rkt b/os-dns.rkt
index 05eb65d..0d704d3 100644
--- a/os-dns.rkt
+++ b/os-dns.rkt
@@ -48,7 +48,8 @@
     (subscribe 'spy
       (message-handlers w
 	[(dns-request message source sink)
-	 (pretty-display `(DNS (,source asks ,sink) ,@(dns-message-questions message)))]
+	 (pretty-display `(DNS (,source asks ,sink ,(dns-message-id message))
+			       ,@(dns-message-questions message)))]
 	[(dns-reply message source sink)
 	 (pretty-display `(DNS (,source answers ,sink) ,message))]
 	[x
diff --git a/proxy.rkt b/proxy.rkt
index dd7b1c9..29a93f0 100644
--- a/proxy.rkt
+++ b/proxy.rkt
@@ -219,4 +219,5 @@
 	       cnames))])]))
 
 (require "test-rrs.rkt")
+(file-stream-buffer-mode (current-output-port) 'none)
 (start-proxy (test-port-number) test-roots)