diff --git a/library/server/request/rest/tests/sample.ecf b/library/server/request/rest/tests/sample.ecf
index e678a4ae..006bc5e4 100644
--- a/library/server/request/rest/tests/sample.ecf
+++ b/library/server/request/rest/tests/sample.ecf
@@ -18,7 +18,7 @@
 	<target name="sample_fcgi" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<setting name="executable_name" value="sample"/>
-		<library name="ewsgi_fcgi" location="..\..\..\ewsgi/connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
+		<library name="ewsgi_fcgi" location="..\..\..\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/gateway$</exclude>
@@ -29,7 +29,7 @@
 	<target name="sample_cgi" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<setting name="executable_name" value="sample"/>
-		<library name="ewsgi_cgi" location="..\..\..\ewsgi/connectors\cgi\cgi-safe.ecf" readonly="false"/>
+		<library name="ewsgi_cgi" location="..\..\..\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/gateway$</exclude>
@@ -41,7 +41,7 @@
 	<target name="sample_nino" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<setting name="executable_name" value="sample"/>
-		<library name="ewsgi_nino" location="..\..\..\ewsgi/connectors\nino\nino-safe.ecf" readonly="false"/>
+		<library name="ewsgi_nino" location="..\..\..\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
 		<library name="default_nino" location="..\..\..\wsf\default\nino-safe.ecf" readonly="false"/>
 
 
diff --git a/library/server/wsf/src/wsf_application.e b/library/server/wsf/src/wsf_application.e
index 2d845a04..29a728d8 100644
--- a/library/server/wsf/src/wsf_application.e
+++ b/library/server/wsf/src/wsf_application.e
@@ -26,7 +26,7 @@ feature -- WGI Execution
 
 	wgi_execute (req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER)
 		do
-			execute (req, res)
+			execute (create {WSF_REQUEST}.make_from_wgi (req), create {WSF_RESPONSE}.make_from_wgi (res))
 		end
 
 end
diff --git a/tools/bin/update_library_index.bat b/tools/bin/update_library_index.bat
index dbb869a9..194394e9 100644
--- a/tools/bin/update_library_index.bat
+++ b/tools/bin/update_library_index.bat
@@ -19,7 +19,7 @@ rename library.index.tmp library.index
 
 call:sed test library.index
 call:sed example library.index
-call:sed wsf library.index
+call:sed template library.index
 
 echo. > library.index.tmp
 For /F "tokens=* delims=" %%A in (library.index) do echo.%%A >> library.index.tmp