diff --git a/s4-funcs.sh b/s4-funcs.sh
index ffe08a0..e6c2849 100755
--- a/s4-funcs.sh
+++ b/s4-funcs.sh
@@ -1177,8 +1177,8 @@
   path=${URL%/*}
   expire="`expire '' '%a, %d-%b-%Y %H:%M:%S GMT'`"
   for kv; do
-    # echo "Set-Cookie: $kv; expires=$expire; Path=$path"
-    echo "Set-Cookie: $kv; expires=$expire;"
+    echo "Set-Cookie: $kv; expires=$expire; Path=$path"
+    # echo "Set-Cookie: $kv; expires=$expire;"
   done
 )
 contenttype() {
@@ -1401,8 +1401,8 @@
 
 cgiinit() {
   session=`date +%F-$$`
-  tmpf=tmp/stream
   tmpd=`tmpd=$tmpdir mktempd`
+  tmpf=$tmpd/stream.$$
   tmpfiles=$tmpfiles" $tmpd"
   addsession $session
   getcookie
@@ -1413,7 +1413,6 @@
 		# cat > $tmpf		# too much?
 		head -c $CONTENT_LENGTH > $tmpf	# safe?
       		(echo CL=$CONTENT_LENGTH; ls -lF $tmpf) 1>&3
-		cp tmp/stream /tmp	# 2020-0531
 		s="`cat tmp/stream`"
 		tmpfiles=$tmpfiles"${tmpfiles+ }$tmpf"
 		;;