diff --git a/draft/application/cms/cms-safe.ecf b/draft/application/cms/cms-safe.ecf
index ae3fa3e0..03be6e2f 100644
--- a/draft/application/cms/cms-safe.ecf
+++ b/draft/application/cms/cms-safe.ecf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" library_target="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669" library_target="cms">
 	<target name="cms">
-		<root class="WEB_CMS" feature="make_and_launch"/>
+		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
@@ -10,9 +10,8 @@
 		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
 		<setting name="exception_trace" value="true"/>
-
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_nino" location="..\..\..\library\server\wsf\default\nino-safe.ecf"/>
 		<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
@@ -24,7 +23,6 @@
 		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid-safe.ecf"/>
 		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_session" location="..\..\..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true">
-		</cluster>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/draft/application/cms/cms.ecf b/draft/application/cms/cms.ecf
index c8139825..43bdba7d 100644
--- a/draft/application/cms/cms.ecf
+++ b/draft/application/cms/cms.ecf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cms" library_target="cms" uuid="0D24AE3C-61DA-4E81-8DCF-90C2E65FB669">
 	<target name="cms">
-		<root class="WEB_CMS" feature="make_and_launch"/>
+		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
diff --git a/draft/application/cms/src/kernel/cms_css.e b/draft/application/cms/src/kernel/cms_css.e
index f6f89777..d3cc9ff3 100644
--- a/draft/application/cms/src/kernel/cms_css.e
+++ b/draft/application/cms/src/kernel/cms_css.e
@@ -49,13 +49,13 @@ feature -- Conversion
 					if not s_selectors.is_empty then
 						s_selectors.append_character (',')
 					end
-					s_selectors.append (cs.item)
+					s_selectors.append (cs.item.string)
 				end
 				if not s_selectors.is_empty then
 					a_target.append (s_selectors)
 					a_target.append_character (' ')
 					a_target.append_character ('{')
-					a_target.append (c.item.style)
+					c.item.style.append_text_to (a_target)
 					a_target.append_character ('}')
 					a_target.append_character ('%N')
 				end
diff --git a/draft/application/cms/src/modules/user/user_login_cms_execution.e b/draft/application/cms/src/modules/user/user_login_cms_execution.e
index 56f1a4f0..9fd23483 100644
--- a/draft/application/cms/src/modules/user/user_login_cms_execution.e
+++ b/draft/application/cms/src/modules/user/user_login_cms_execution.e
@@ -17,9 +17,7 @@ feature -- Status
 
 	valid_credential (u,p: READABLE_STRING_32): BOOLEAN
 		do
-			if attached service.storage.user_by_name (u) as l_user then
-				Result := attached l_user.encoded_password as l_pass and then l_pass.same_string (service.storage.encoded_password (p))
-			end
+			Result := service.storage.is_valid_credential (u, p)
 		end
 
 feature -- Execution
diff --git a/examples/tutorial/step_4/hello/src/hello_application.e b/examples/tutorial/step_4/hello/src/hello_application.e
index 2dfbaeb1..3d0024a5 100644
--- a/examples/tutorial/step_4/hello/src/hello_application.e
+++ b/examples/tutorial/step_4/hello/src/hello_application.e
@@ -59,12 +59,6 @@ feature -- Helper: mapping
 
 feature -- Execution
 
-	execute_default (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Default request handler if no other are relevant
-		do
-			res.redirect_now_with_content (req.script_url ("/hello"), "Redirection to " + req.script_url ("/hello"), "text/html")
-		end
-
 	execute_hello (req: WSF_REQUEST; res: WSF_RESPONSE)
 			-- Computed response message.
 		local
diff --git a/library/network/http_client/tests/test-safe.ecf b/library/network/http_client/tests/test-safe.ecf
index 6c32920a..5b2c90d0 100644
--- a/library/network/http_client/tests/test-safe.ecf
+++ b/library/network/http_client/tests/test-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="test_http_client" uuid="920E5C50-41E1-4DAC-8D48-D9C860E49228">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="test_http_client" uuid="920E5C50-41E1-4DAC-8D48-D9C860E49228">
 	<target name="test_http_client">
 		<root class="TEST" feature="make"/>
 		<file_rule>
diff --git a/library/network/http_client/tests/test_http_client.e b/library/network/http_client/tests/test_http_client.e
index a5cf2228..0000f8d8 100644
--- a/library/network/http_client/tests/test_http_client.e
+++ b/library/network/http_client/tests/test_http_client.e
@@ -48,7 +48,7 @@ feature -- Test routines
 			res: HTTP_CLIENT_RESPONSE
 			h: STRING
 		do
-			create res.make
+			create res.make ("http://example.com/")
 			create h.make_empty
 			h.append ("normal: NORMAL%R%N")
 			h.append ("concat: ABC%R%N")
diff --git a/library/server/ewf_support/ewf_support.ecf b/library/server/ewf_support/ewf_support.ecf
index b3e7d50b..e95a3590 100644
--- a/library/server/ewf_support/ewf_support.ecf
+++ b/library/server/ewf_support/ewf_support.ecf
@@ -10,6 +10,17 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="false">
+			<cluster name="before_72" location="$|before_72\">
+				<condition>
+					<version type="compiler" max="7.1.9.9999"/>
+				</condition>
+			</cluster>
+			<cluster name="greater_or_72" location="$|greater_or_72\">
+				<condition>
+					<version type="compiler" min="7.2.0.0"/>
+				</condition>
+			</cluster>
+		</cluster>
 	</target>
 </system>