diff --git a/examples/desktop_app/src/main_window.e b/examples/desktop_app/src/main_window.e
index b259db99..654aace6 100644
--- a/examples/desktop_app/src/main_window.e
+++ b/examples/desktop_app/src/main_window.e
@@ -70,7 +70,6 @@ feature {NONE} -- Initialization
 			-- can be added here.
 		local
 			l_browser_box: EV_VERTICAL_BOX
-			l_server_box: EV_VERTICAL_BOX
 			l_hor_box: EV_HORIZONTAL_BOX
 			vb: EV_VERTICAL_BOX
 		do
diff --git a/examples/tutorial/step_2/hello/hello.ecf b/examples/tutorial/step_2/hello/hello.ecf
index 24f49675..534a1b8e 100644
--- a/examples/tutorial/step_2/hello/hello.ecf
+++ b/examples/tutorial/step_2/hello/hello.ecf
@@ -10,7 +10,8 @@
 		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<precompile name="precomp_wsf" location="..\..\..\..\precomp\wsf-safe.ecf"/>
+		<setting name="concurrency" value="scoop"/>
+		<precompile name="precomp_wsf" location="..\..\..\..\precomp\wsf-scoop-safe.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
diff --git a/examples/tutorial/step_3/hello/hello.ecf b/examples/tutorial/step_3/hello/hello.ecf
index 7f5b73d9..e5d78703 100644
--- a/examples/tutorial/step_3/hello/hello.ecf
+++ b/examples/tutorial/step_3/hello/hello.ecf
@@ -10,8 +10,8 @@
 		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
-		<precompile name="precomp_wsf-mt" location="..\..\..\..\precomp\wsf-mt-safe.ecf"/>
+		<setting name="concurrency" value="scoop"/>
+		<precompile name="precomp_wsf-scoop" location="..\..\..\..\precomp\wsf-scoop-safe.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
diff --git a/library/network/protocol/http/tests/tests-safe.ecf b/library/network/protocol/http/tests/tests-safe.ecf
index cd571244..7ad1cdd1 100644
--- a/library/network/protocol/http/tests/tests-safe.ecf
+++ b/library/network/protocol/http/tests/tests-safe.ecf
@@ -7,9 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true"  void_safety="all">
+		<option warning="true" void_safety="all">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\http-safe.ecf" readonly="false">
 			<option>
diff --git a/library/network/protocol/http/tests/tests.ecf b/library/network/protocol/http/tests/tests.ecf
index e8f89a55..212d1706 100644
--- a/library/network/protocol/http/tests/tests.ecf
+++ b/library/network/protocol/http/tests/tests.ecf
@@ -7,9 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true"  void_safety="none">
+		<option warning="true" void_safety="none">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="..\http.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
diff --git a/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf b/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
index ca11cb7b..3ce5811e 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/nino/nino-safe.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true" void_safety="all">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\..\..\..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
diff --git a/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf b/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
index f1b45574..1011a571 100644
--- a/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/obsolete/v0/ewsgi/connectors/nino/nino.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true" void_safety="none">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\..\..\..\..\text\encoder\encoder.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
diff --git a/library/server/obsolete/v0/wsf/connector/nino-safe.ecf b/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
index 151bfda9..b3d46573 100644
--- a/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
+++ b/library/server/obsolete/v0/wsf/connector/nino-safe.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="all">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_nino" location="..\..\..\..\obsolete\v0\ewsgi\connectors\nino\nino-safe.ecf"/>
 		<library name="encoder" location="..\..\..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
diff --git a/library/server/obsolete/v0/wsf/connector/nino.ecf b/library/server/obsolete/v0/wsf/connector/nino.ecf
index d2302df1..ba0da66e 100644
--- a/library/server/obsolete/v0/wsf/connector/nino.ecf
+++ b/library/server/obsolete/v0/wsf/connector/nino.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="none">
 		</option>
-		<setting name="concurrency" value="scoop"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="connector_nino" location="..\..\..\..\obsolete\v0\ewsgi\connectors\nino\nino.ecf"/>
 		<library name="encoder" location="..\..\..\..\..\text\encoder\encoder.ecf" readonly="false"/>
diff --git a/library/server/obsolete/v0/wsf/default/nino-safe.ecf b/library/server/obsolete/v0/wsf/default/nino-safe.ecf
index 476c5bc8..4937ce34 100644
--- a/library/server/obsolete/v0/wsf/default/nino-safe.ecf
+++ b/library/server/obsolete/v0/wsf/default/nino-safe.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="all">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
 		<library name="wsf_nino" location="..\connector\nino-safe.ecf"/>
diff --git a/library/server/obsolete/v0/wsf/default/nino.ecf b/library/server/obsolete/v0/wsf/default/nino.ecf
index ee211de2..ce4bb3e8 100644
--- a/library/server/obsolete/v0/wsf/default/nino.ecf
+++ b/library/server/obsolete/v0/wsf/default/nino.ecf
@@ -9,7 +9,7 @@
 		</file_rule>
 		<option warning="true"  void_safety="none">
 		</option>
-		<setting name="concurrency" value="none"/>
+		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="..\wsf.ecf"/>
 		<library name="wsf_nino" location="..\connector\nino.ecf"/>