diff --git a/src/pacemaker.c b/src/pacemaker.c
index 0558223..db11893 100644
--- a/src/pacemaker.c
+++ b/src/pacemaker.c
@@ -1,187 +1,187 @@
 /* 
  * Copyright (C) 2011 Jiaju Zhang <jjzhang@suse.de>
  * Copyright (C) 2013-2014 Philipp Marek <philipp.marek@linbit.com>
  * 
  * 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 <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "log.h"
 #include "pacemaker.h"
 #include "inline-fn.h"
 
 #define COMMAND_MAX	256
 
 
 static const char * interpret_rv(int rv)
 {
 	static char text[64];
 	int p;
 
 
 	if (rv == 0)
 		return "0";
 
 	p = sprintf(text, "rv %d", WEXITSTATUS(rv));
 
 	if (WIFSIGNALED(rv))
 		sprintf(text + p, "  signal %d", WTERMSIG(rv));
 
 	return text;
 }
 
 
 
 static void pcmk_grant_ticket(struct ticket_config *tk)
 {
 	char cmd[COMMAND_MAX];
 	int rv;
 
 	snprintf(cmd, COMMAND_MAX, "crm_ticket -t %s -g --force",
 			tk->name);
 	log_info("command: '%s' was executed", cmd);
 	rv = system(cmd);
 	if (rv != 0)
-		log_error("error: \"%s\" failed, rv %s", cmd, interpret_rv(rv));
+		log_error("error: \"%s\" failed, %s", cmd, interpret_rv(rv));
 }
 
 static void pcmk_revoke_ticket(struct ticket_config *tk)
 {
 	char cmd[COMMAND_MAX];
 	int rv;
 
 	snprintf(cmd, COMMAND_MAX, "crm_ticket -t %s -r --force",
 			tk->name);
 	log_info("command: '%s' was executed", cmd);
 	rv = system(cmd);
 	if (rv != 0)
-		log_error("error: \"%s\" failed, rv %s", cmd, interpret_rv(rv));
+		log_error("error: \"%s\" failed, %s", cmd, interpret_rv(rv));
 }
 
 
 static int crm_ticket_set(const struct ticket_config *tk, const char *attr, int64_t val)
 {
 	char cmd[COMMAND_MAX];
 	int i, rv;
 
 
 	snprintf(cmd, COMMAND_MAX,
 		 "crm_ticket -t '%s' -S '%s' -v %" PRIi64,
 		 tk->name, attr, val);
 	/* If there are errors, there's not much we can do but retry ... */
 	for (i=0; i<3 &&
 			(rv = system(cmd));
 			i++) ;
 
 	log_info("'%s' gave result %s", cmd, interpret_rv(rv));
 
 	return rv;
 }
 
 
 static void pcmk_store_ticket(struct ticket_config *tk)
 {
 	crm_ticket_set(tk, "owner", (int32_t)get_node_id(tk->owner));
 	crm_ticket_set(tk, "expires", tk->expires);
 	crm_ticket_set(tk, "ballot", tk->last_ack_ballot);
 }
 
 
 static int crm_ticket_get(struct ticket_config *tk,
 		const char *attr, int64_t *data)
 {
 	char cmd[COMMAND_MAX];
 	char line[256];
 	int rv;
 	int64_t v;
 	FILE *p;
 
 
 	*data = -1;
 	v = 0;
 	snprintf(cmd, COMMAND_MAX,
 			"crm_ticket -t '%s' -G '%s' --quiet",
 			tk->name, attr);
 
 	p = popen(cmd, "r");
 	if (p == NULL) {
 		rv = errno;
 		log_error("popen error %d (%s) for \"%s\"",
 				rv, strerror(rv), cmd);
 		return rv || -EINVAL;
 	}
 	if (fgets(line, sizeof(line) - 1, p) == NULL) {
 		rv = ENODATA;
 		goto out;
 	}
 
 	rv = EINVAL;
 	if (sscanf(line, "%" PRIi64, &v) == 1)
 		rv = 0;
 
 	*data = v;
 
 out:
 	rv = pclose(p);
-	log_info("command \"%s\" returned rv %s, value %" PRIi64, cmd, interpret_rv(rv), v);
+	log_info("command \"%s\" returned %s, value %" PRIi64, cmd, interpret_rv(rv), v);
 	return rv;
 }
 
 
 static void pcmk_load_ticket(struct ticket_config *tk)
 {
 	int rv;
 	int64_t v;
 
 
 	rv = crm_ticket_get(tk, "expires", &v);
 	if (!rv) {
 		tk->expires = v;
 	}
 
 	rv = crm_ticket_get(tk, "ballot", &v);
 	if (!rv) {
 		tk->new_ballot =
 			tk->last_ack_ballot = v;
 	}
 
 	rv = crm_ticket_get(tk, "owner", &v);
 	if (!rv) {
 		/* No check, node could have been deconfigured. */
 		find_site_by_id(v, &tk->proposed_owner);
 	}
 
 
 	disown_if_expired(tk);
 
 	tk->proposal_acknowledges = local->bitmask;
 
 	/* We load only when the state is completely unknown. */
 	tk->state = ST_INIT;
 
 	return;
 }
 
 struct ticket_handler pcmk_handler = {
 	.grant_ticket   = pcmk_grant_ticket,
 	.revoke_ticket  = pcmk_revoke_ticket,
 	.store_ticket   = pcmk_store_ticket,
 	.load_ticket    = pcmk_load_ticket,
 };