diff --git a/library/server/wsf/router/wsf_router_item.e b/library/server/wsf/router/wsf_router_item.e
index 1800e7b9..00467390 100644
--- a/library/server/wsf/router/wsf_router_item.e
+++ b/library/server/wsf/router/wsf_router_item.e
@@ -3,8 +3,8 @@ note
 				Entry of WSF_ROUTER
 				It contains
 					- mapping
-					- request methods				
-					
+					- request methods
+
 				]"
 	date: "$Date$"
 	revision: "$Revision$"
@@ -40,20 +40,23 @@ feature	-- Access
 
 feature -- Status report
 
-	debug_output: STRING
+	debug_output: READABLE_STRING_GENERAL
 			-- String that should be displayed in debugger to represent `Current'.
+		local
+			s: STRING_32
 		do
-			create Result.make_from_string (mapping.debug_output)
+			create s.make_from_string_general (mapping.debug_output)
 			if attached request_methods as mtds then
-				Result.append_string (" [ ")
+				s.append_string (" [ ")
 				across
 					mtds as c
 				loop
-					Result.append_string (c.item)
-					Result.append_string (" ")
+					s.append_string (c.item)
+					s.append_string (" ")
 				end
-				Result.append_string ("]")
+				s.append_string ("]")
 			end
+			Result := s
 		end
 
 feature -- Change
@@ -68,7 +71,7 @@ invariant
 	mapping_attached: mapping /= Void
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/server/wsf/router/wsf_router_mapping.e b/library/server/wsf/router/wsf_router_mapping.e
index 873a25cb..9a2a3135 100644
--- a/library/server/wsf/router/wsf_router_mapping.e
+++ b/library/server/wsf/router/wsf_router_mapping.e
@@ -48,10 +48,10 @@ feature -- Documentation
 
 feature -- Status report
 
-	debug_output: STRING
+	debug_output: READABLE_STRING_GENERAL
 			-- String that should be displayed in debugger to represent `Current'.
 		do
-			Result := description.as_string_8 + " : " + associated_resource
+			Result := description + {STRING_32} " : " + associated_resource.to_string_32
 		end
 
 feature -- Status
@@ -88,7 +88,7 @@ feature -- Helper
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e b/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e
index a43e19bb..95f54564 100644
--- a/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e
+++ b/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e
@@ -45,14 +45,14 @@ feature {NONE} -- Execution
 
 feature -- Status report
 
-	debug_output: STRING
+	debug_output: READABLE_STRING_GENERAL
 			-- String that should be displayed in debugger to represent `Current'.
 		do
 			Result := Precursor + " {" + ({C}).name + "}"
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/server/wsf/router_context/wsf_router_context_mapping.e b/library/server/wsf/router_context/wsf_router_context_mapping.e
index bf7f8895..87ea3a67 100644
--- a/library/server/wsf/router_context/wsf_router_context_mapping.e
+++ b/library/server/wsf/router_context/wsf_router_context_mapping.e
@@ -22,14 +22,14 @@ feature -- Access
 
 feature -- Status report
 
-	debug_output: STRING
+	debug_output: READABLE_STRING_GENERAL
 			-- String that should be displayed in debugger to represent `Current'.
 		do
 			Result := Precursor + " {" + ({C}).name + "}"
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software