diff --git a/src/base64.c b/src/base64.c
index 15b5b74..5d63a67 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -2,6 +2,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "base64.h"
+
 /* Encode table - base64 alphabet is defined by the rfc */
 static const char cb64[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 /* Generate decode table at compile time. */
diff --git a/src/faction.c b/src/faction.c
index d2b7294..da7c596 100644
--- a/src/faction.c
+++ b/src/faction.c
@@ -109,9 +109,7 @@ void faction_modPlayer(int f, int mod) {
 
 int faction_getPlayer(int f) {
   if(faction_isFaction(f)) {
-    if(faction_isFaction(f)) {
-      return faction_stack[f].player;
-    }
+    return faction_stack[f].player;
   } else {
     DEBUG("%d is an invalid faction/alliance", f);
     return -1000;
diff --git a/src/pilot.h b/src/pilot.h
index 606ad02..63fc7bc 100644
--- a/src/pilot.h
+++ b/src/pilot.h
@@ -156,7 +156,7 @@ int pilot_rmOutfit(Pilot* pilot, Outfit* outfit, int quantity);
 char* pilot_getOutfits(Pilot* pilot);
 void pilot_calcStats(Pilot* pilot);
 /* Normal cargo. */
-int pilot_cagoUsed(Pilot* pilot);   /* Get amount of cargo onboard. */
+int pilot_cargoUsed(Pilot* pilot);   /* Get amount of cargo onboard. */
 int pilot_cargoFree(Pilot* p);      /* Cargo space. */
 int pilot_addCargo(Pilot* pilot, Commodity* cargo, int quantity);
 int pilot_rmCargo(Pilot* pilot, Commodity* cargo, int quantity);