diff --git a/draft/library/server/request/rest/rest-safe.ecf b/draft/library/server/request/rest/rest-safe.ecf
index d1d70b10..2d839c29 100644
--- a/draft/library/server/request/rest/rest-safe.ecf
+++ b/draft/library/server/request/rest/rest-safe.ecf
@@ -12,6 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\..\library\protocol\http\http-safe.ecf"/>
+		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template-safe.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
 			<file_rule>
 				<exclude>/html$</exclude>
diff --git a/draft/library/server/request/rest/rest.ecf b/draft/library/server/request/rest/rest.ecf
index 78cf6b0b..49870876 100644
--- a/draft/library/server/request/rest/rest.ecf
+++ b/draft/library/server/request/rest/rest.ecf
@@ -11,6 +11,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf.ecf"/>
 		<library name="http" location="..\..\..\..\..\library\protocol\http\http.ecf"/>
+		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
 			<file_rule>
 				<exclude>/html$</exclude>
diff --git a/library/server/wsf/default/libfcgi/default_service_launcher.e b/library/server/wsf/default/libfcgi/default_service_launcher.e
index b85229cf..ffbe17e4 100644
--- a/library/server/wsf/default/libfcgi/default_service_launcher.e
+++ b/library/server/wsf/default/libfcgi/default_service_launcher.e
@@ -34,7 +34,7 @@ feature {NONE} -- Initialization
 		do
 			create connector.make (Current)
 		end
-	
+
 feature -- Execution
 
 	launch
@@ -46,7 +46,7 @@ feature -- Execution
 
 feature -- Status report
 
-	connector: detachable WGI_LIBCGI_CONNECTOR
+	connector: detachable WGI_LIBFCGI_CONNECTOR
 			-- Default service name
 
 ;note
diff --git a/library/server/wsf/router/request_file_system_handler.e b/library/server/wsf/router/request_file_system_handler.e
index 8038259b..9b075cfa 100644
--- a/library/server/wsf/router/request_file_system_handler.e
+++ b/library/server/wsf/router/request_file_system_handler.e
@@ -147,7 +147,6 @@ feature -- Execution
 
 	respond_file (f: FILE; ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE)
 		local
-			h: HTTP_HEADER
 			ext: READABLE_STRING_8
 			ct: detachable READABLE_STRING_8
 			fres: WSF_FILE_RESPONSE