diff --git a/draft/library/server/wsf_js_widget/examples/custom-template/src/base_page.e b/draft/library/server/wsf_js_widget/examples/custom-template/src/base_page.e
index 373869c5..31bd49bf 100644
--- a/draft/library/server/wsf_js_widget/examples/custom-template/src/base_page.e
+++ b/draft/library/server/wsf_js_widget/examples/custom-template/src/base_page.e
@@ -23,7 +23,7 @@ feature
 			control.add_class ("container")
 			create navbar.make_with_brand ("EWF JS WIDGET TEMPLATE")
 			navbar.add_list_element (create {WSF_BASIC_CONTROL}.make_with_body ("a", "href=%"/%"", "Home"))
-			create main_control.make ("main_control")
+			create main_control.make
 			control.add_control (navbar)
 			control.add_control (main_control)
 		end
diff --git a/draft/library/server/wsf_js_widget/examples/demo/demo.ecf b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
index 2af9c64b..1104341a 100644
--- a/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
+++ b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
@@ -12,6 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\..\..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client-safe.ecf"/>
+		<library name="json" location="..\..\..\..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<library name="wsf_js_widget" location="..\..\wsf_js_widget-safe.ecf" readonly="false"/>
 	</target>
@@ -21,7 +22,6 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_nino" location="..\..\..\..\..\..\library\server\wsf\default\nino-safe.ecf"/>
-		<library name="json" location="..\..\..\..\..\..\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<cluster name="demo" location=".\" recursive="true"/>
 	</target>
 	<target name="demo_cgi" extends="common">
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 8b282dc4..07d84e45 100644
--- a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -10,16 +10,11 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="encoder" location="..\..\..\..\library\text\encoder\encoder.ecf"/>
 		<library name="http" location="..\..\..\..\library\network\protocol\http\http.ecf"/>
 		<library name="json" location="..\..\..\..\contrib\library\text\parser\json\library\json.ecf"/>
 		<library name="pcre" location="$ISE_LIBRARY\unstable\library\text\regexp\pcre\pcre.ecf"/>
-		<library name="uri_template" location="..\..\..\..\library\text\parser\uri_template\uri_template.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf.ecf"/>
-		<cluster name="kernel" location=".\kernel\" recursive="true">
-			<file_rule>
-				<exclude>/examples$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>
 </system>