diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index b4cd130..dc5d369 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -548,7 +548,7 @@
   u_char type;
   struct stream *s; 
   int num;
-  int count = 0;
+  unsigned int count = 0;
   int write_errno;
 
   /* Yes first of all get peer pointer. */
@@ -873,7 +873,7 @@
   bgp_notify_send_with_data (peer, code, sub_code, NULL, 0);
 }
 
-char *
+const char *
 afi2str (afi_t afi)
 {
   if (afi == AFI_IP)
@@ -884,7 +884,7 @@
     return "Unknown AFI";
 }
 
-char *
+const char *
 safi2str (safi_t safi)
 {
   if (safi == SAFI_UNICAST)