diff --git a/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf b/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
index 177c7b14..656ef827 100644
--- a/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
+++ b/library/server/obsolete/v0/wsf_html/wsf_html-safe.ecf
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_html_v0" uuid="9D0DC2A2-BE67-4499-B730-87C7DDE25860" library_target="wsf_html_v0">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="wsf_html_v0" uuid="9D0DC2A2-BE67-4499-B730-87C7DDE25860" library_target="wsf_html_v0">
 	<target name="wsf_html_v0">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="false" void_safety="all" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="encoder" location="../../../../text/encoder/encoder-safe.ecf"/>
-		<library name="uri_template" location="../../../../text/parser/uri_template/uri_template-safe.ecf"/>
+		<library name="encoder" location="..\..\..\..\text\encoder\encoder-safe.ecf"/>
+		<library name="uri_template" location="..\..\..\..\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="..\wsf\wsf-safe.ecf"/>
 		<cluster name="api" location="..\..\..\wsf_html\api\" recursive="true"/>
 		<cluster name="css" location="..\..\..\wsf_html\css\" recursive="true"/>
diff --git a/library/server/obsolete/v0/wsf_html/wsf_html.ecf b/library/server/obsolete/v0/wsf_html/wsf_html.ecf
index ede0d213..ea8e49bc 100644
--- a/library/server/obsolete/v0/wsf_html/wsf_html.ecf
+++ b/library/server/obsolete/v0/wsf_html/wsf_html.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_html_v0" uuid="9D0DC2A2-BE67-4499-B730-87C7DDE25860" library_target="wsf_html_v0">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="wsf_html_v0" uuid="9D0DC2A2-BE67-4499-B730-87C7DDE25860" library_target="wsf_html_v0">
 	<target name="wsf_html_v0">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true" full_class_checking="true" is_obsolete_routine_type="false" void_safety="none" syntax="standard">
 		</option>
 
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
diff --git a/library/server/wsf_html/widget/wsf_widget_agent_table.e b/library/server/wsf_html/widget/wsf_widget_agent_table.e
index 4af3b6a5..64d88cd3 100644
--- a/library/server/wsf_html/widget/wsf_widget_agent_table.e
+++ b/library/server/wsf_html/widget/wsf_widget_agent_table.e
@@ -60,7 +60,7 @@ feature -- Access
 	data: detachable ITERABLE [G]
 			-- tbody
 
-	compute_item_function: detachable FUNCTION [TUPLE [data: G], WSF_WIDGET_TABLE_ROW]
+	compute_item_function: detachable FUNCTION [G, WSF_WIDGET_TABLE_ROW]
 
 feature -- Change