diff --git a/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
index 3d62dd79..cf51cc6a 100644
--- a/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
+++ b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
@@ -23,8 +23,8 @@ feature {NONE} -- Initialization
 
 	make (a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G])
 		do
-			make_repeater (a_datasource)
 			columns := a_columns
+			make_repeater (a_datasource)
 		end
 
 feature -- Render
@@ -72,4 +72,14 @@ feature -- Properties
 
 	columns: ITERABLE [WSF_GRID_COLUMN]
 
+;note
+	copyright: "2011-2016, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
diff --git a/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
index f3c64a1f..bdba9937 100644
--- a/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
+++ b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
@@ -199,7 +199,7 @@ feature -- Properties
 			-- List of current controls in this multi control
 
 ;note
-	copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2016, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
index 49674046..71a80a84 100644
--- a/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
diff --git a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
index 3b97bcb6..6d43ea66 100644
--- a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -9,11 +9,12 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="standard">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="..\..\..\..\library\network\protocol\http\http.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
 		<library name="pcre" location="$ISE_LIBRARY\unstable\library\text\regexp\pcre\pcre.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf.ecf"/>
 		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>