diff --git a/library/server/wsf/router/wsf_file_system_handler.e b/library/server/wsf/router/wsf_file_system_handler.e
index 71d567a5..65d6a417 100644
--- a/library/server/wsf/router/wsf_file_system_handler.e
+++ b/library/server/wsf/router/wsf_file_system_handler.e
@@ -376,7 +376,7 @@ feature -- Execution
 			if ct = Void then
 				ct := {HTTP_MIME_TYPES}.application_force_download
 			end
-			create fres.make_with_content_type (ct, f.path.name)
+			create fres.make_with_content_type_and_path (ct, f.path)
 			fres.set_status_code ({HTTP_STATUS_CODE}.ok)
 
 				-- cache control
diff --git a/library/utility/general/error/src/visitor/output_error_visitor.e b/library/utility/general/error/src/visitor/output_error_visitor.e
index fb574e3b..3ccac415 100644
--- a/library/utility/general/error/src/visitor/output_error_visitor.e
+++ b/library/utility/general/error/src/visitor/output_error_visitor.e
@@ -69,8 +69,6 @@ feature -- Process
 
 	process_group (g: ERROR_GROUP)
 			-- <Precursor>
-		local
-			l_errors: LIST [ERROR]
 		do
 			across
 				g.sub_errors as s