diff --git a/library/server/wsf/extension/filter/wsf_debug_filter.e b/library/server/wsf/extension/filter/wsf_debug_filter.e
index 4a715457..a9354ddb 100644
--- a/library/server/wsf/extension/filter/wsf_debug_filter.e
+++ b/library/server/wsf/extension/filter/wsf_debug_filter.e
@@ -28,7 +28,7 @@ feature -- Basic operations
 			-- Execute the filter
 		local
 			s: STRING_8
-			dbg: WSF_DEBUG_OUTPUT
+			dbg: WSF_DEBUG_INFORMATION
 		do
 			create s.make (2048)
 			create dbg.make
diff --git a/library/server/wsf/extension/handler/wsf_debug_handler.e b/library/server/wsf/extension/handler/wsf_debug_handler.e
index 00a6437a..55ef3cfd 100644
--- a/library/server/wsf/extension/handler/wsf_debug_handler.e
+++ b/library/server/wsf/extension/handler/wsf_debug_handler.e
@@ -52,7 +52,6 @@ feature -- Access
 			p: WSF_PAGE_RESPONSE
 			l_len: INTEGER
 			dbg: WSF_DEBUG_INFORMATION
-			utf: UTF_CONVERTER
 		do
 			create s.make (2048)
 			s.append ("= EWF DEBUG =")
diff --git a/library/server/wsf/extension/wsf_debug_information.e b/library/server/wsf/extension/wsf_debug_information.e
index 1b9b2180..e320fd2f 100644
--- a/library/server/wsf/extension/wsf_debug_information.e
+++ b/library/server/wsf/extension/wsf_debug_information.e
@@ -112,13 +112,13 @@ feature -- Execution
 			a_output.append ("Environment vars:")
 			a_output.append (eol)
 			across
-				(create {EXECUTION_ENVIRONMENT}).starting_environment_variables as ic
+				(create {EXECUTION_ENVIRONMENT}).starting_environment as ic
 			loop
 				a_output.append_character (' ')
 				a_output.append_character ('-')
-				a_output.append_string (ic.key)
+				a_output.append_string (html_encoder.general_encoded_string (ic.key))
 				a_output.append_character ('=')
-				a_output.append_string (ic.item)
+				a_output.append_string (html_encoder.general_encoded_string (ic.item))
 				a_output.append (eol)
 			end
 			a_output.append (eol)