diff --git a/library/server/wsf/wsf_extension-safe.ecf b/library/server/wsf/wsf_extension-safe.ecf
index bd44ce84..7bfa4489 100644
--- a/library/server/wsf/wsf_extension-safe.ecf
+++ b/library/server/wsf/wsf_extension-safe.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
 		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
-		<library name="wsf-safe" location="..\wsf\wsf-safe.ecf"/>
+		<library name="wsf-safe" location="wsf-safe.ecf"/>
 		<cluster name="extension" location="./extension" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/wsf_extension.ecf b/library/server/wsf/wsf_extension.ecf
index e3622f9b..cef881de 100644
--- a/library/server/wsf/wsf_extension.ecf
+++ b/library/server/wsf/wsf_extension.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
 		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
-		<library name="wsf" location="..\wsf\wsf.ecf"/>
+		<library name="wsf" location="wsf.ecf"/>
 		<cluster name="extension" location="./extension" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/wsf_session-safe.ecf b/library/server/wsf/wsf_session-safe.ecf
index 0c679d78..b94c5e7a 100644
--- a/library/server/wsf/wsf_session-safe.ecf
+++ b/library/server/wsf/wsf_session-safe.ecf
@@ -14,7 +14,7 @@
 		<library name="uuid" location="$ISE_LIBRARY/library/uuid/uuid-safe.ecf"/>
 		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
-		<library name="wsf-safe" location="..\wsf\wsf-safe.ecf"/>
+		<library name="wsf-safe" location="wsf-safe.ecf"/>
 		<cluster name="session" location="./session" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/wsf_session.ecf b/library/server/wsf/wsf_session.ecf
index 5c2e26b0..f085bc3b 100644
--- a/library/server/wsf/wsf_session.ecf
+++ b/library/server/wsf/wsf_session.ecf
@@ -14,7 +14,7 @@
 		<library name="uuid" location="$ISE_LIBRARY/library/uuid/uuid.ecf"/>
 		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
-		<library name="wsf" location="..\wsf\wsf.ecf"/>
+		<library name="wsf" location="wsf.ecf"/>
 		<cluster name="session" location="./session" recursive="true"/>
 	</target>
 </system>
diff --git a/library/text/encoder/encoder-safe.ecf b/library/text/encoder/encoder-safe.ecf
index 7db8d66c..513e1e4e 100644
--- a/library/text/encoder/encoder-safe.ecf
+++ b/library/text/encoder/encoder-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="encoder" uuid="EE80E648-C64D-4802-8868-C57AAFEACC55" library_target="encoder">
+<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-8-0.xsd" name="encoder" uuid="EE80E648-C64D-4802-8868-C57AAFEACC55" library_target="encoder">
 	<target name="encoder">
 		<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" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -17,12 +17,12 @@
 				<exclude>/tests$</exclude>
 				<exclude>/spec$</exclude>
 			</file_rule>
-			<cluster name="src_before_70" location="$\spec\before_70" recursive="true">
+			<cluster name="src_before_70" location="$|spec\before_70\" recursive="true">
 				<condition>
 					<version type="compiler" max="7.0.8.7585"/>
 				</condition>
 			</cluster>
-			<cluster name="src_70" location="$\spec\70" recursive="true">
+			<cluster name="src_70" location="$|spec\70\" recursive="true">
 				<condition>
 					<version type="compiler" min="7.0.8.7586"/>
 				</condition>
diff --git a/library/text/encoder/encoder.ecf b/library/text/encoder/encoder.ecf
index 5c3184fc..71732816 100644
--- a/library/text/encoder/encoder.ecf
+++ b/library/text/encoder/encoder.ecf
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true">
+		<option warning="true" full_class_checking="true" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
diff --git a/library/utility/general/error/error-safe.ecf b/library/utility/general/error/error-safe.ecf
index b5eb8493..e6da0b5a 100644
--- a/library/utility/general/error/error-safe.ecf
+++ b/library/utility/general/error/error-safe.ecf
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
diff --git a/library/utility/general/error/error.ecf b/library/utility/general/error/error.ecf
index ea7b6080..f21ea9b9 100644
--- a/library/utility/general/error/error.ecf
+++ b/library/utility/general/error/error.ecf
@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true">
+		<option warning="true" full_class_checking="true" syntax="provisional">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>