diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf
index 5c654920..95a12d0c 100644
--- a/library/server/wsf/wsf-safe.ecf
+++ b/library/server/wsf/wsf-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="wsf" uuid="A37CE5AA-4D2A-4441-BC6A-0A1D7EC49647" library_target="wsf">
+<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" uuid="A37CE5AA-4D2A-4441-BC6A-0A1D7EC49647" library_target="wsf">
 	<target name="wsf">
 		<root all_classes="true"/>
 		<file_rule>
@@ -11,13 +11,13 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
-		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="error" location="../../utility/general/error/error-safe.ecf"/>
-		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
-		<library name="uri_template" location="../../text/parser/uri_template/uri_template-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
-		<cluster name="src" location=".\src" recursive="true"/>
-		<cluster name="router" location=".\router" recursive="true"/>
+		<library name="error" location="..\..\utility\general\error\error-safe.ecf"/>
+		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
+		<library name="http" location="..\..\network\protocol\http\http-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="uri_template" location="..\..\text\parser\uri_template\uri_template-safe.ecf"/>
+		<cluster name="router" location=".\router\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index 736905b6..0cb7a441 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -37,7 +37,7 @@
 		<library name="ex_simple" location="..\examples\simple\simple.ecf" readonly="false"/>
 		<library name="ex_filter" location="..\examples\filter\filter-safe.ecf" readonly="false"/>
 		<library name="cms" location="..\draft\application\cms\cms-safe.ecf" readonly="false"/>
-		<library name="css" location="..\draft\library\text\css\css-safe.ecf" readonly="false"/>
+		<library name="wsf_html" location="..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
 	</target>
 	<target name="all_windows" extends="all">
 		<description>Compiling as Windows , on other platforms than Windows</description>