diff --git a/scripts/http-trace.nse b/scripts/http-trace.nse
index a0cfd8688..8d0d7f6d4 100644
--- a/scripts/http-trace.nse
+++ b/scripts/http-trace.nse
@@ -7,7 +7,7 @@ response.
 -- @output
 -- 80/tcp open  http
 -- |  http-trace: Response differs from request.  First 5 additional lines:
--- |  Cookie: UID=d4287aa38d02f409841b4e0c0050c13148a85d01c0c0a154d4ef56dfc2b4fc1b0
+-- |  Cookie: UID=d4287aa38d02f409841b4e0c0050c131...
 -- |  Country: us
 -- |  Ip_is_advertise_combined: yes
 -- |  Ip_conntype-Confidence: -1
diff --git a/scripts/pop3-capabilities.nse b/scripts/pop3-capabilities.nse
index 737a4cb43..a54127e71 100644
--- a/scripts/pop3-capabilities.nse
+++ b/scripts/pop3-capabilities.nse
@@ -5,7 +5,7 @@ Retrieves POP3 email server capabilities.
 ---
 -- @output
 -- 110/tcp open  pop3
--- |_ pop3-capabilities:  USER CAPA RESP-CODES UIDL PIPELINING STLS TOP SASL(PLAIN)
+-- |_ pop3-capabilities: USER CAPA RESP-CODES UIDL PIPELINING STLS TOP SASL(PLAIN)
 
 author = "Philip Pickering <pgpickering@gmail.com>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
@@ -14,16 +14,18 @@ categories = {"default"}
 
 require 'pop3'
 require 'shortport'
+require 'stdnse'
 
 portrule = shortport.port_or_service({110}, "pop3")
 
 action = function(host, port)
   local capa = pop3.capabilities(host, port)
   if capa then 
-     local capstr = ""
+     -- Convert the capabilities table into an array of strings.
+     local capstrings = {}
      local cap, args
      for cap, args in pairs(capa) do
-	capstr = capstr .. " " .. cap
+	local capstr = cap
 	if type(args) == "string" then capstr = capstr .. "(" .. args .. ")" end
 	if type(args) == "table" then
 	   local arg
@@ -33,8 +35,9 @@ action = function(host, port)
 	   end
 	   capstr = string.sub(capstr, 1, #capstr - 1) .. ")"
 	end
+	table.insert(capstrings, capstr)
      end
-     return capstr
+     return stdnse.strjoin(" ", capstrings)
   else
      return "server doesn't support CAPA"
   end