anchor.diff:  		    ?info("service_discovery_rpc:resolve_remote_service(~p): Service not found.", 
   			   [Service]),
   		    
  -		    {reply, [not_found], State };
  +		    {reply, [not_found], St };
   
   		NetworkAddress -> %% Found
   		    ?debug("service_discovery_rpc:resolve_service(~p): Service is on static node ~p", 
   			   [Service, NetworkAddress]),
   		    
  -		    {reply, [ok, NetworkAddress ], State}
  +		    {reply, [ok, NetworkAddress ], St}
   	    end
       end;
   
  -handle_call({rvi_call, get_remote_services, _Args}, _From, State) ->
  +handle_call({rvi_call, get_remote_services, _Args}, _From, St) ->
       Services = get_services_(?REMOTE_SERVICE_TABLE),
  -    {reply,  [ok, Services ], State };
  -
  -handle_call({rvi_call, get_all_services, _Args}, _From, State) ->
  +    {reply,  [ok, Services ], St };
  +
  +handle_call({rvi_call, get_all_services, _Args}, _From, St) ->
       RemoteSvc = ets:foldl(fun(#service_entry {service = ServiceName}, Acc) -> 
   				  [ ServiceName  | Acc ] end, 
   			  [], ?REMOTE_SERVICE_TABLE),
  
positive.code: 		      end, Services),
  
  	    %% Forward to scheduler now that we have updated our own state
  	    schedule_rpc:register_remote_services(Address, Services),
  
  	    %% Forward to service edge so that it can inform its locally
  	    %% connected services.
  
negative.code: %% Handle calls received through regular gen_server calls, routed by
  %% rvi_common:request()
  
  handle_call({rvi_call, register_local_service, [Service, Address] }, _From, St) ->
      ?info("service_discovery_rpc:register_local_service(): ~p ->  ~p",
  	  [Service, Address]),
  
  