diff --git a/fencing/remote.c b/fencing/remote.c
index 30ba5b0eb8..9d5e0bd3a6 100644
--- a/fencing/remote.c
+++ b/fencing/remote.c
@@ -1,518 +1,519 @@
 /* 
  * Copyright (C) 2009 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <crm_internal.h>
 
 #include <sys/param.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 
 #include <crm/crm.h>
 #include <crm/msg_xml.h>
 #include <crm/common/ipc.h>
 #include <crm/common/cluster.h>
 
 #include <crm/stonith-ng.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 #include <internal.h>
 
 enum op_state 
 {
     st_query,
     st_exec,
     st_done,
     st_failed,
 };
 
 typedef struct st_query_result_s
 {
 	char *host;
 	int devices;
 
 } st_query_result_t;
 
 typedef struct remote_fencing_op_s
 {
 	char *id;
 	char *target;
 	char *action;
 	guint replies;
 
 	guint op_timer;	
 	guint query_timer;
 	guint base_timeout;
 
 	char *delegate;
 	time_t completed;	
 	long long call_options;
 
 	enum op_state state;
 	char *client_id;
 	char *originator;
 	GListPtr query_results;
 	xmlNode *request;
 	
 } remote_fencing_op_t;
 
 GHashTable *remote_op_list = NULL;
 static void call_remote_stonith(remote_fencing_op_t *op, st_query_result_t *peer);
 extern xmlNode *stonith_create_op(
     int call_id, const char *token, const char *op, xmlNode *data, int call_options);
 
 static void free_remote_query(gpointer data)
 {
     if(data) {
 	st_query_result_t *query = data;
 	crm_free(query->host);
 	crm_free(query);
     }
 }
 
 static void free_remote_op(gpointer data)
 {
     remote_fencing_op_t *op = data;
 
     crm_log_xml_debug(op->request, "Destroying");
 
     crm_free(op->id);
     crm_free(op->action);
     crm_free(op->target);
     crm_free(op->client_id);
     crm_free(op->originator);
 
     if(op->query_timer) {
 	g_source_remove(op->query_timer);
     }
     if(op->op_timer) {
 	g_source_remove(op->op_timer);
     }
     if(op->query_results) {
 	slist_destroy(st_query_result_t, result, op->query_results,
 		      free_remote_query(result);
 	    );
     }
     if(op->request) {
 	free_xml(op->request);
 	op->request = NULL;
     }
     crm_free(op);
 }
 
 static void remote_op_done(remote_fencing_op_t *op, xmlNode *data, int rc) 
 {
     int call = 0;
     xmlNode *reply = NULL;
     xmlNode *local_data = NULL;
     xmlNode *notify_data = NULL;
 
     op->completed = time(NULL);
     if(op->request != NULL) {
 	crm_element_value_int(op->request, F_STONITH_CALLID, &call);
 	/* else: keep going, make sure the details are accurate for ops that arrive late */
     }
     
     if(op->query_timer) {
 	g_source_remove(op->query_timer);
 	op->query_timer = 0;
     }
     if(op->op_timer) {
 	g_source_remove(op->op_timer);
 	op->op_timer = 0;
     }
     
     if(data == NULL) {
 	data = create_xml_node(NULL, "remote-op");
 	local_data = data;
 
     } else {
 	op->delegate = crm_element_value_copy(data, F_ORIG);
     }
     
     crm_xml_add_int(data, "state", op->state);
     crm_xml_add(data, F_STONITH_TARGET,    op->target);
     crm_xml_add(data, F_STONITH_OPERATION, op->action); 
 
     if(op->request != NULL) {
 	reply = stonith_construct_reply(op->request, NULL, data, rc);
 	crm_xml_add(reply, F_STONITH_DELEGATE,  op->delegate);
 	
 	crm_info("Notifing clients of %s (%s of %s from %s by %s): %d, rc=%d",
 		 op->id, op->action, op->target, op->client_id, op->delegate, op->state, rc);
 
     } else {
 	crm_err("We've already notified clients of %s (%s of %s from %s by %s): %d, rc=%d",
 		op->id, op->action, op->target, op->client_id, op->delegate, op->state, rc);
 	return;
     }
     
     if(call && reply) {
 	/* Don't bother with this if there is no callid - and thus the op originated elsewhere */
 	do_local_reply(reply, op->client_id, op->call_options & st_opt_sync_call, FALSE);
     }
 
     /* Do notification with a clean data object */
     notify_data = create_xml_node(NULL, "st-data");
     crm_xml_add_int(notify_data, "state",	  op->state);
     crm_xml_add_int(notify_data, F_STONITH_RC,    rc);
     crm_xml_add(notify_data, F_STONITH_TARGET,    op->target);
     crm_xml_add(notify_data, F_STONITH_OPERATION, op->action); 
     crm_xml_add(notify_data, F_STONITH_DELEGATE,  op->delegate);
     crm_xml_add(notify_data, F_STONITH_REMOTE,    op->id);
     crm_xml_add(notify_data, F_STONITH_ORIGIN,    op->originator);
     
     do_stonith_notify(0, STONITH_OP_FENCE, rc, notify_data, NULL);
     
     free_xml(notify_data);
     free_xml(local_data);
     free_xml(reply);
 
     /* Free non-essential parts of the record
      * Keep the record around so we can query the history
      */
     if(op->query_results) {
 	slist_destroy(st_query_result_t, result, op->query_results,
 		      free_remote_query(result);
 	    );
 	op->query_results = NULL;
     }
 
     if(op->request) {
 	free_xml(op->request);
 	op->request = NULL;
     }
 }
 
 
 static gboolean remote_op_timeout(gpointer userdata)
 {
     remote_fencing_op_t *op = userdata;
     op->query_timer = 0;
 
     if(op->state == st_done) {
 	crm_debug("Action %s (%s) for %s already completed", op->action, op->id, op->target);
 	return FALSE;
     }
     
     crm_err("Action %s (%s) for %s timed out", op->action, op->id, op->target);
     remote_op_done(op, NULL, st_err_timeout);
     op->state = st_failed;
 
     return FALSE;
 }
 
 static gboolean remote_op_query_timeout(gpointer data)
 {
     remote_fencing_op_t *op = data;
 
     op->query_timer = 0;
     if(op->state == st_done) {
 	crm_debug("Operation %s for %s already completed", op->id, op->target);
 	
     } else if(op->state == st_exec) {
 	crm_debug("Operation %s for %s already in progress", op->id, op->target);
 	
     } else if(op->query_results) {
 	crm_info("Query %s for %s complete: %d", op->id, op->target, op->state);
 	call_remote_stonith(op, NULL);
 
     } else {
 	crm_err("Query %s for %s timed out", op->id, op->target);
 	if(op->op_timer) {
 	    g_source_remove(op->op_timer);
 	    op->op_timer = 0;
 	}
 	remote_op_timeout(op);
     }
     
     
     return FALSE;
 }
 
 void *create_remote_stonith_op(const char *client, xmlNode *request, gboolean peer)
 {
     remote_fencing_op_t *op = NULL;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_TARGET, request, LOG_ERR);
     
     if(remote_op_list == NULL) {
 	remote_op_list = g_hash_table_new_full(
 	    g_str_hash, g_str_equal, NULL, free_remote_op);
     }
     
     if(peer) {
 	const char *peer_id = crm_element_value(dev, F_STONITH_REMOTE);
 	CRM_CHECK(peer_id != NULL, return NULL);
 	
 	op = g_hash_table_lookup(remote_op_list, peer_id);
 	if(op) {
 	    crm_debug("%s already exists", peer_id);
 	    return op;
 	}
     }
     
     crm_malloc0(op, sizeof(remote_fencing_op_t));
-    crm_element_value_int(dev, F_STONITH_TIMEOUT, (int*)&(op->base_timeout));
+    crm_element_value_int(request, F_STONITH_TIMEOUT, (int*)&(op->base_timeout));
 
     if(peer) {
 	op->id = crm_element_value_copy(dev, F_STONITH_REMOTE);
 
     } else {
 	cl_uuid_t new_uuid;
 	char uuid_str[UU_UNPARSE_SIZEOF];
 
 	cl_uuid_generate(&new_uuid);
 	cl_uuid_unparse(&new_uuid, uuid_str);
 	
 	op->id = crm_strdup(uuid_str);
     }
     
     g_hash_table_replace(remote_op_list, op->id, op);
 
     op->state = st_query;
     op->action = crm_element_value_copy(dev, F_STONITH_ACTION);
     op->originator = crm_element_value_copy(dev, "src");
 
     if(op->originator == NULL) {
 	/* Local request */
 	op->originator = crm_strdup(stonith_our_uname);
     }
     
     op->client_id = crm_strdup(client);
     op->target = crm_element_value_copy(dev, F_STONITH_TARGET);
     op->request = copy_xml(request); /* TODO: Figure out how to avoid this */
     crm_element_value_int(request, F_STONITH_CALLOPTS, (int*)&(op->call_options));
 
     return op;
 }
 
 
 void initiate_remote_stonith_op(stonith_client_t *client, xmlNode *request) 
 {
     xmlNode *query = NULL;
     remote_fencing_op_t *op = NULL;
 
     crm_log_xml_debug(request, "RemoteOp");
     
     op = create_remote_stonith_op(client->id, request, FALSE);
     op->op_timer = g_timeout_add(1000*op->base_timeout, remote_op_timeout, op);
     op->query_timer = g_timeout_add(100*op->base_timeout, remote_op_query_timeout, op);
 
     query = stonith_create_op(0, op->id, STONITH_OP_QUERY, NULL, 0);
     crm_xml_add(query, F_STONITH_REMOTE, op->id);
     crm_xml_add(query, F_STONITH_TARGET, op->target);
     crm_xml_add(query, F_STONITH_ACTION, op->action);    
     crm_xml_add(query, F_STONITH_CLIENTID, op->client_id);    
-    crm_xml_add_int(query, F_STONITH_TIMEOUT, 900*op->base_timeout);
+    crm_xml_add_int(query, F_STONITH_TIMEOUT, 100*op->base_timeout);
     
     crm_info("Initiating remote operation %s for %s: %s", op->action, op->target, op->id);
     CRM_CHECK(op->action, return);
     
     send_cluster_message(NULL, crm_msg_stonith_ng, query, FALSE);
 
     free_xml(query);
 }
 
 static void call_remote_stonith(remote_fencing_op_t *op, st_query_result_t *peer) 
 {
     xmlNode *query = stonith_create_op(0, op->id, STONITH_OP_FENCE, NULL, 0);;
     crm_xml_add(query, F_STONITH_REMOTE, op->id);
     crm_xml_add(query, F_STONITH_TARGET, op->target);    
     crm_xml_add(query, F_STONITH_ACTION, op->action);    
+    crm_xml_add_int(query, F_STONITH_TIMEOUT, 900*op->base_timeout);
     
     op->state = st_exec;
 
     while(peer == NULL && op->query_results) {
 	peer = g_list_nth_data(op->query_results, 0);
 	op->query_results = g_list_remove(op->query_results, peer);
 	    
 	if(peer && peer->devices < 1) {
 	    free_remote_query(peer);
 	    peer = NULL;
 	}
     }
 
     if(peer) {
 	crm_info("Requesting that %s perform op %s %s", peer->host, op->action, op->target);
 	send_cluster_message(peer->host, crm_msg_stonith_ng, query, FALSE);
 
     } else if(op->query_timer == 0) {
 	/* We've exhausted all available peers */
 	crm_info("No remaining peers capable of terminating %s", op->target);
 	remote_op_timeout(op);
 	
     } else {
 	crm_info("Waiting for additional peers capable of terminating %s", op->target);
     }
     
     free_remote_query(peer);
     free_xml(query);
 }
 
 static gint sort_peers(gconstpointer a, gconstpointer b)
 {
     const st_query_result_t *peer_a = a;
     const st_query_result_t *peer_b = a;
 
     /* TODO: Factor in priority? */
     if(peer_a->devices > peer_b->devices) {
 	return -1;
 
     } else if(peer_a->devices > peer_b->devices) {
 	return 1;
     }
     return 0;
 }
 
 int process_remote_stonith_query(xmlNode *msg) 
 {
     int devices = 0;
     const char *id = NULL;
     remote_fencing_op_t *op = NULL;
     st_query_result_t *result = NULL;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_REMOTE, msg, LOG_ERR);
 
     crm_log_xml_debug(msg, "QueryResult");
 
     CRM_CHECK(dev != NULL, return st_err_internal);
 
     id = crm_element_value(dev, F_STONITH_REMOTE);
     CRM_CHECK(id != NULL, return st_err_internal);
     
     dev = get_xpath_object("//@st-available-devices", msg, LOG_ERR);
     CRM_CHECK(dev != NULL, return st_err_internal);
     crm_element_value_int(dev, "st-available-devices", &devices);
 
     op = g_hash_table_lookup(remote_op_list, id);
     if(op == NULL) {
 	crm_debug("Unknown or expired remote op: %s", id);
 	return st_err_unknown_operation;
     }
 
     op->replies++;
     crm_malloc0(result, sizeof(st_query_result_t));
     result->host = crm_element_value_copy(msg, F_ORIG);
     result->devices = devices;
 
     /* TODO: Implement options
      * A) If we have anyone that can do the job
      * B) If we have someone that can do the job and some percent of the known peers
      * C) If all known peers have responded
      *
      * Implement A first
      */
 
     /* Track A */
 
     if(result->devices > 0) {
 	gboolean do_queue = FALSE;
 	gboolean do_exec = FALSE;
 	
 	if(op->call_options & st_opt_allow_suicide) {
 	    crm_info("Allowing %s to potentialy fence itself", op->target);
 
 	} else if(safe_str_eq(result->host, op->target)) {
 	    crm_info("Ignoring reply from %s, hosts are not permitted to commit suicide", op->target);
 	    free_remote_query(result);
 	    return 0;
 	}
 	
 	switch(op->state) {
 	    case st_query:
 		if( op->call_options & st_opt_all_replies ) {
 		    do_queue = TRUE;
 
 		} else {
 		    do_exec = TRUE;
 		}
 		break;
 	    case st_exec:
 		do_queue = TRUE;
 		break;
 	    case st_failed:
 		do_exec = TRUE;
 		break;
 	    case st_done:
 		crm_info("Discarding query result from %s (%d deices): Operation is in state %d",
 			 result->host, result->devices, op->state);
 		break;
 	}
 	
 	if(do_exec) {
 	    call_remote_stonith(op, result);
 
 	} else if(do_queue) {
 	    crm_info("Queuing query result from %s (%d devices): %s",
 		     result->host, result->devices,
 		     op->state==st_query?"Waiting for remaining replies":"Operation is pending");
 	    op->query_results = g_list_insert_sorted(op->query_results, result, sort_peers);
 
 	} else {
 	    free_remote_query(result);
 	}
 
     } else {
 	free_remote_query(result);
     }
     
     return 0;
 }
 
 int process_remote_stonith_exec(xmlNode *msg) 
 {
     int rc = 0;
     const char *id = NULL;
     remote_fencing_op_t *op = NULL;
     xmlNode *dev = get_xpath_object("//@"F_STONITH_REMOTE, msg, LOG_ERR);
 
     crm_log_xml_info(msg, "ExecResult");
 
     CRM_CHECK(dev != NULL, return st_err_internal);
 
     id = crm_element_value(dev, F_STONITH_REMOTE);
     CRM_CHECK(id != NULL, return st_err_internal);
     
     dev = get_xpath_object("//@"F_STONITH_RC, msg, LOG_ERR);
     CRM_CHECK(dev != NULL, return st_err_internal);
 
     if(remote_op_list) {
 	op = g_hash_table_lookup(remote_op_list, id);
     }
     
     if(op == NULL) {
 	crm_err("Unknown or expired remote op: %s", id);
 	return st_err_unknown_operation;
     }
     
     crm_element_value_int(dev, F_STONITH_RC, &rc);
     if(rc == stonith_ok || op->state != st_exec) {
 	remote_op_done(op, msg, rc);
 	
     } else if(rc < stonith_ok && op->state == st_exec) {
 	call_remote_stonith(op, NULL);
     }
     return rc;
 }