diff --git a/src/kernel/battle.c b/src/kernel/battle.c
index 9b9319bb6..3fd771f96 100644
--- a/src/kernel/battle.c
+++ b/src/kernel/battle.c
@@ -2322,9 +2322,9 @@ static double horsebonus(const unit * u)
     
     if (skl < 1) return 0.0;
     
-    it_horse = (rtype = get_resourcetype(R_HORSE)) ? rtype->itype : 0;
-    it_elvenhorse = (rtype = get_resourcetype(R_UNICORN)) ? rtype->itype : 0;
-    it_charger = (rtype = get_resourcetype(R_CHARGER)) ? rtype->itype : 0;
+    it_horse = ((rtype = get_resourcetype(R_HORSE))!=NULL) ? rtype->itype : 0;
+    it_elvenhorse = ((rtype = get_resourcetype(R_UNICORN))!=NULL) ? rtype->itype : 0;
+    it_charger = ((rtype = get_resourcetype(R_CHARGER))!=NULL) ? rtype->itype : 0;
 
     for (itm=u->items; itm; itm = itm->next) {
         if (itm->type->flags & ITF_ANIMAL) {
diff --git a/src/kernel/connection.c b/src/kernel/connection.c
index 00064dc3e..a01c3c826 100644
--- a/src/kernel/connection.c
+++ b/src/kernel/connection.c
@@ -69,7 +69,7 @@ void free_borders(void)
   }
 }
 
-connection *find_border(unsigned int id)
+connection *find_border(int id)
 {
   int key;
   for (key = 0; key != BORDER_MAXHASH; key++) {
diff --git a/src/kernel/connection.h b/src/kernel/connection.h
index e5b435140..edbf23bb5 100644
--- a/src/kernel/connection.h
+++ b/src/kernel/connection.h
@@ -89,7 +89,7 @@ extern "C" {
     struct border_type *next;   /* for internal use only */
   } border_type;
 
-  extern connection *find_border(unsigned int id);
+  extern connection *find_border(int id);
   int resolve_borderid(variant data, void *addr);
   extern void free_borders(void);
 
diff --git a/src/kernel/move.c b/src/kernel/move.c
index bbf2051f2..d8f0303d8 100644
--- a/src/kernel/move.c
+++ b/src/kernel/move.c
@@ -420,9 +420,9 @@ static int canride(unit * u)
     const item_type *it_horse, *it_elvenhorse, *it_charger;
     const resource_type *rtype;
 
-    it_horse = (rtype = get_resourcetype(R_HORSE)) ? rtype->itype : 0;
-    it_elvenhorse = (rtype = get_resourcetype(R_UNICORN)) ? rtype->itype : 0;
-    it_charger = (rtype = get_resourcetype(R_CHARGER)) ? rtype->itype : 0;
+    it_horse = ((rtype = get_resourcetype(R_HORSE))!=NULL) ? rtype->itype : 0;
+    it_elvenhorse = ((rtype = get_resourcetype(R_UNICORN)) != NULL) ? rtype->itype : 0;
+    it_charger = ((rtype = get_resourcetype(R_CHARGER)) != NULL) ? rtype->itype : 0;
 
     for (itm = u->items; itm; itm = itm->next) {
         if (itm->type == it_horse || itm->type == it_charger) {