diff --git a/draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e b/draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
index d2b88f43..6f5c32b7 100644
--- a/draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
+++ b/draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
@@ -10,9 +10,9 @@ feature -- Access
 		local
 			libfcgi: WGI_LIBFCGI_CONNECTOR
 		do
-			create libfcgi.make (Current)
+			create libfcgi.make (to_wgi_service)
 			libfcgi.launch
-		end	
+		end
 
 	gateway_name: STRING = "libFCGI"
 
@@ -20,7 +20,7 @@ feature -- Access
 		do
 			(create {EXCEPTIONS}).die (a_code)
 		end
-	
+
 
 note
 	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
diff --git a/library/server/ewsgi/examples/hello_world/src/hello_world.e b/library/server/ewsgi/examples/hello_world/src/hello_world.e
index 42a302da..e881197e 100644
--- a/library/server/ewsgi/examples/hello_world/src/hello_world.e
+++ b/library/server/ewsgi/examples/hello_world/src/hello_world.e
@@ -7,6 +7,9 @@ note
 class
 	HELLO_WORLD
 
+inherit
+	WGI_SERVICE
+
 create
 	make
 
@@ -15,7 +18,7 @@ feature {NONE} -- Initialization
 	make
 		do
 			print ("Example: start a Nino web server on port " + port_number.out + ", %Nand reply Hello World for any request such as http://localhost:8123/%N")
-			(create {NINO_SERVICE}.make_custom (agent execute, "")).listen (port_number)
+			(create {NINO_SERVICE}.make_custom (Current, "")).listen (port_number)
 		end
 
 	execute (req: WGI_REQUEST; res: WGI_RESPONSE)
@@ -28,7 +31,7 @@ feature {NONE} -- Initialization
 	port_number: INTEGER = 8123
 
 note
-	copyright: "2011-2011, Eiffel Software and others"
+	copyright: "2011-2012, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software