diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index 60e5c1a..cd995c8 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -1,441 +1,439 @@
 /* 
  * Copyright (C) 2011 Jiaju Zhang <jjzhang@suse.de>
  * 
  * 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 <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include "paxos.h"
 #include "paxos_lease.h"
 #include "transport.h"
 #include "config.h"
 #include "timer.h"
 #include "list.h"
 
 #define PAXOS_LEASE_SPACE		"paxoslease"
 #define PLEASE_VALUE_LEN		1024
 
 struct paxos_lease_msghdr {
 	int leased;
 };
 
 struct paxos_lease_value {
 	char name[PAXOS_NAME_LEN+1];
 	int owner;
 	int expiry;	
 };
 
 struct lease_state {
 	int round;
 	struct paxos_lease_value *plv;
 	unsigned long long expires;
 	struct timerlist *timer;
 };
 
 struct paxos_lease {
 	char name[PAXOS_NAME_LEN+1];
 	pi_handle_t pih;
 	struct lease_state proposer;
 	struct lease_state acceptor;
 	int owner;
 	int expiry;
 	int relet;
 	int failover;
 	unsigned long long expires;
 	void (*end_lease) (pi_handle_t, int);
 	struct timerlist *timer;
 	struct list_head list;
 };
 
 static LIST_HEAD(lease_head);
 
 static int myid = -1;
 static struct paxos_operations *px_op = NULL;
 const struct paxos_lease_operations *p_l_op;
 ps_handle_t ps_handle = 0;
 
 static void end_paxos_request(pi_handle_t handle, int round, int result)
 {
 	struct paxos_lease *pl;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return;
 
 	if (round != pl->proposer.round)
 		return;
 
 	pl->end_lease((pl_handle_t)pl, result);
 		
 	return;	
 }
 
 static void lease_expires(unsigned long data)
 {
 	struct paxos_lease *pl = (struct paxos_lease *)data;
 	pl_handle_t plh = (pl_handle_t)pl;
 	struct paxos_lease_result plr;
 
 	if (pl->owner != myid) {
 		pl->owner = -1;
 
 		strcpy(plr.name, pl->name);
 		plr.owner = -1;
 		plr.expires = 0;
 		p_l_op->notify(plh, &plr);
 
 		if (pl->proposer.timer)
 			del_timer(pl->proposer.timer);
 		if (pl->acceptor.timer)
 			del_timer(pl->acceptor.timer);
 
 		if (pl->failover)
 			paxos_lease_acquire(plh, 1, NULL);
 	} else if (pl->owner == myid && pl->relet) {
 		struct paxos_lease_value value;
 		strncpy(value.name, pl->name, PAXOS_NAME_LEN + 1);
 		value.owner = myid;
 		value.expiry = pl->expiry;
 		paxos_propose(pl->pih, &value, pl->proposer.round);
 	} else {
 		pl->owner = -1;
 
 		strcpy(plr.name, pl->name);
 		plr.owner = -1;
 		plr.expires = 0;
 		p_l_op->notify(plh, &plr);
 
 		if (pl->proposer.timer)
 			del_timer(pl->proposer.timer);
 		if (pl->acceptor.timer)
 			del_timer(pl->acceptor.timer);
 	}
 }
 
 int paxos_lease_acquire(pl_handle_t handle,
 			int relet,
 			void (*end_acquire) (pl_handle_t handle, int result))
 {
 	struct paxos_lease *pl = (struct paxos_lease *)handle;
 	struct paxos_lease_value value;
 	int round;
 
 	strncpy(value.name, pl->name, PAXOS_NAME_LEN + 1);
 	value.owner = myid;
 	value.expiry = pl->expiry;
 	pl->relet = relet;
 	pl->end_lease = end_acquire;
 
 	round = paxos_round_request(pl->pih, &value, end_paxos_request);
 	if (round <= 0)
 		return -1;
 
 	pl->proposer.round = round;	
 	return 0;
 }
 
 static int lease_catchup(const void *name)
 {
 	struct paxos_lease *pl;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (!strcmp(pl->name, name)) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	p_l_op->catchup(name, &pl->owner, &pl->expires);
 
 	return 0;	
 }
 
 static int lease_prepared(pi_handle_t handle __attribute__((unused)),
 			  void *header)
 {
 	struct paxos_lease_msghdr *hdr = header;
 
 	if (hdr->leased)
 		return 0;
 	else
 		return 1;
 }
 
 static int handle_lease_request(pi_handle_t handle, void *header)
 {
 	struct paxos_lease_msghdr *hdr;
 	struct paxos_lease *pl;
 	int found = 0;
 
 	hdr = header;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	if (pl->owner == -1)
 		hdr->leased = 0;
 	else
 		hdr->leased = 1;
 
 	return 0;
 }
 
 static int lease_propose(pi_handle_t handle,
 			 void *extra __attribute__((unused)),
 			 int round, void *value)
 {
 	struct paxos_lease *pl;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	if (round != pl->proposer.round)
 		return -1;
 
 	if (!pl->proposer.plv) {
 		pl->proposer.plv = malloc(sizeof(struct paxos_lease_value));
 		if (!pl->proposer.plv)
 			return -ENOMEM;
 	}
 	memcpy(pl->proposer.plv, value, sizeof(struct paxos_lease_value));
 
 	if (pl->relet) {
 		pl->proposer.timer = add_timer(4 * pl->expiry / 5,
 					       (unsigned long)pl,
 					       lease_expires);
 		pl->proposer.expires = current_time() + 4 * pl->expiry / 5;
 	} else {
 		pl->proposer.timer = add_timer(pl->expiry, (unsigned long)pl,
 					       lease_expires);
 		pl->proposer.expires = current_time() + pl->expiry;
 	}
 
 	return 0;
 }
 
 static int lease_accepted(pi_handle_t handle,
 			  void *extra __attribute__((unused)),
 			  int round, void *value)
 {
 	struct paxos_lease *pl;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	pl->acceptor.round = round;
 	if (!pl->acceptor.plv) {
 		pl->acceptor.plv = malloc(sizeof(struct paxos_lease_value));
 		if (!pl->acceptor.plv)
 			return -ENOMEM;
 	}
 	memcpy(pl->acceptor.plv, value, sizeof(struct paxos_lease_value));
 
 	pl->acceptor.timer = add_timer(pl->expiry, (unsigned long)pl,
 				       lease_expires);
 	pl->acceptor.expires = current_time() + pl->expiry;
 
 	return 0;	
 }
 
 static int lease_commit(pi_handle_t handle,
 			void *extra __attribute__((unused)),
 			int round)
 {
 	struct paxos_lease *pl;
-	pl_handle_t plh = (pl_handle_t)pl;
 	struct paxos_lease_result plr;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	if (round != pl->proposer.round)
 		return -1;
 
 	pl->owner = pl->proposer.plv->owner;
 	pl->expiry = pl->proposer.plv->expiry;
 
 	strcpy(plr.name, pl->proposer.plv->name);
 	plr.owner = pl->proposer.plv->owner;
 	plr.expires = current_time() + pl->proposer.plv->expiry;
 
-	p_l_op->notify(plh, &plr);
+	p_l_op->notify((pl_handle_t)pl, &plr);
 
 	return 0;	
 }
 
 static int lease_learned(pi_handle_t handle,
 			 void *extra __attribute__((unused)),
 			 int round)
 {
 	struct paxos_lease *pl;
-	pl_handle_t plh = (pl_handle_t)pl;
 	struct paxos_lease_result plr;
 	int found = 0;
 
 	list_for_each_entry(pl, &lease_head, list) {
 		if (pl->pih == handle) {
 			found = 1;
 			break;
 		}
 	}
 	if (!found)
 		return -1;
 
 	if (round != pl->acceptor.round)
 		return -1;
 
 	pl->owner = pl->acceptor.plv->owner;
 	pl->expiry = pl->acceptor.plv->expiry;
 
 	strcpy(plr.name, pl->acceptor.plv->name);
 	plr.owner = pl->acceptor.plv->owner;
 	plr.expires = current_time() + pl->acceptor.plv->expiry;
 
-	p_l_op->notify(plh, &plr);
+	p_l_op->notify((pl_handle_t)pl, &plr);
 
 	return 0;
 }
 
 pl_handle_t paxos_lease_init(const void *name,
 			     unsigned int namelen,
 			     int expiry,
 			     int number,
 			     int failover,
 			     unsigned char *role,
 			     int *prio,
 			     const struct paxos_lease_operations *pl_op)
 {
 	ps_handle_t psh;
 	pi_handle_t pih;
 	struct paxos_lease *lease;
 
 	if (namelen > PAXOS_NAME_LEN)
 		return -EINVAL;
 
 	if (myid == -1)
 		myid = pl_op->get_myid();
 
 	if (!ps_handle) {
 		px_op = malloc(sizeof(struct paxos_operations));
 		if (!px_op)
 			return -ENOMEM;
 		memset(px_op, 0, sizeof(struct paxos_operations));
 		px_op->get_myid = pl_op->get_myid;
 		px_op->send = pl_op->send;
 		px_op->broadcast = pl_op->broadcast;
 		px_op->catchup = lease_catchup;
 		px_op->prepare = lease_prepared;
 		px_op->promise = handle_lease_request;
 		px_op->propose = lease_propose;
 		px_op->accepted = lease_accepted;
 		px_op->commit = lease_commit;
 		px_op->learned = lease_learned;
 		p_l_op = pl_op;
 
 		psh = paxos_space_init(PAXOS_LEASE_SPACE,
 				       number,
 				       sizeof(struct paxos_lease_msghdr),
 				       PLEASE_VALUE_LEN,
 				       role,
 				       px_op);
 		if (psh <= 0) {
 			free(px_op);
 			px_op = NULL;	
 			return psh;
 		}
 		ps_handle = psh; 
 	}
 	
 	lease = malloc(sizeof(struct paxos_lease));
 	if (!lease)
 		return -ENOMEM;
 	memset(lease, 0, sizeof(struct paxos_lease));
 	strncpy(lease->name, name, PAXOS_NAME_LEN + 1);
 	lease->owner = -1;
 	lease->expiry = expiry;
 	lease->failover = failover;
 	list_add_tail(&lease->list, &lease_head);
 
 	pih = paxos_instance_init(ps_handle, name, prio);
 	if (pih <= 0) {
 		free(lease);	
 		return pih;
 	}
 	lease->pih = pih;
 
 	return (pl_handle_t)lease;
 }
 
 int paxos_lease_on_receive(void *msg, int msglen)
 {
 	return paxos_recvmsg(msg, msglen);
 }
 
 int paxos_lease_exit(pl_handle_t handle)
 {
 	struct paxos_lease *pl = (struct paxos_lease *)handle;
 
 	if (px_op)
 		free(px_op);
 
 	if (pl->proposer.plv)
 		free(pl->proposer.plv);
 	if (pl->proposer.timer)
 		del_timer(pl->proposer.timer);
 	if (pl->acceptor.plv)
 		free(pl->acceptor.plv);
 	if (pl->acceptor.timer)
 		del_timer(pl->acceptor.timer);
 
 	return 0;
 }