diff --git a/src/inline-fn.h b/src/inline-fn.h
index b36facd5..db1c9385 100644
--- a/src/inline-fn.h
+++ b/src/inline-fn.h
@@ -29,7 +29,7 @@
 
 
 
-inline static uint32_t get_local_id(void)
+inline static int get_local_id(void)
 {
 	return local ? local->site_id : -1;
 }
diff --git a/src/main.c b/src/main.c
index c23c1218..9f52064f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -242,8 +242,10 @@ static int format_peers(char **pdata, unsigned int *len)
 				s->recv_err_cnt,
 				s->sec_cnt,
 				s->invalid_cnt);
-		if (alloc - (cp - data) <= 0)
+		if (alloc - (cp - data) <= 0) {
+			free(data);
 			return -ENOMEM;
+		}
 	}
 
 	*pdata = data;
diff --git a/src/ticket.h b/src/ticket.h
index d4a77c5f..abd45b3e 100644
--- a/src/ticket.h
+++ b/src/ticket.h
@@ -35,8 +35,8 @@ extern int TIME_RES;
 #define DEFAULT_RETRIES			10
 
 
-#define foreach_ticket(i_,t_) for(i=0; (t_=booth_conf->ticket+i, i<booth_conf->ticket_count); i++)
-#define foreach_node(i_,n_) for(i=0; (n_=booth_conf->site+i, i<booth_conf->site_count); i++)
+#define foreach_ticket(i_,t_) for(i_=0; (t_=booth_conf->ticket+i_, i_<booth_conf->ticket_count); i_++)
+#define foreach_node(i_,n_) for(i_=0; (n_=booth_conf->site+i_, i_<booth_conf->site_count); i_++)
 
 #define set_leader(tk, who) do { \
 	tk->leader = who; \